Align the name of the component with what it is deployed on the platform

Signed-off-by: cmoulliard <[email protected]>
ch007m · Aug 28, 2024 · 2e4b312 · 2e4b312
1 parent 1ed58f6
commit 2e4b312
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/configurations/konflux/build-bash-jam-cfg.yaml b/configurations/konflux/build-bash-jam-cfg.yaml
@@ -12,7 +12,7 @@ application:
   name: my-quarkus
   enable: false
 component:
-  name: quarkus-1
+  name: my-quarkus-app
   enable: false
 
 job:

diff --git a/configurations/konflux/build-bash-pack-cfg.yaml b/configurations/konflux/build-bash-pack-cfg.yaml
@@ -12,7 +12,7 @@ application:
   name: my-quarkus
   enable: false
 component:
-  name: quarkus-1
+  name: my-quarkus-app
   enable: false
 
 job:

diff --git a/configurations/konflux/build-quarkus-app-cfg.yaml b/configurations/konflux/build-quarkus-app-cfg.yaml
@@ -12,13 +12,13 @@ application:
   name: my-quarkus
   enable: false
 component:
-  name: quarkus-1
+  name: my-quarkus-app
   enable: false
 
 job:
   # One of the supported resources: PipelineRun, Pipeline
   resourceType: PipelineRun
-  name: quarkus-app-on-push
+  name: quarkus-1-on-push
   description: PipelineRun performing a build of a Quarkus application using pack CLI
 
   workspaces:

diff --git a/configurations/konflux/build-quarkus-app-lifecycle-build-cfg.yaml b/configurations/konflux/build-quarkus-app-lifecycle-build-cfg.yaml
@@ -12,13 +12,13 @@ application:
   name: my-quarkus
   enable: false
 component:
-  name: quarkus-1
+  name: my-quarkus-app
   enable: false
 
 job:
   # One of the supported resources: PipelineRun, Pipeline
   resourceType: PipelineRun
-  name: quarkus-app-on-push
+  name: quarkus-1-on-push
   description: PipelineRun performing a build of a Quarkus application using buildpack task and lifecycle
 
   workspaces:

diff --git a/configurations/konflux/build-quarkus-app-lifecycle-extension-cfg.yaml b/configurations/konflux/build-quarkus-app-lifecycle-extension-cfg.yaml
@@ -17,7 +17,7 @@ component:
 
 job:
   resourceType: PipelineRun
-  name: quarkus-app-on-push
+  name: quarkus-1-on-push
   description: PipelineRun doing a build of a Quarkus application using buildpack - extension task
 
   workspaces:

diff --git a/src/main/java/dev/snowdrop/factory/konflux/pipeline/Pipelines.java b/src/main/java/dev/snowdrop/factory/konflux/pipeline/Pipelines.java
@@ -169,7 +169,11 @@ public HasMetadata generatePipeline(Configurator cfg) {
         /* TODO: Code to be reviewed to avoid hard code values
         */
         tasks.stream()
-            .filter(t -> t.getName().equals("buildpacks-extension-phases") || t.getName().equals("buildpacks-phases") || t.getName().equals(("pack")))
+            .filter(t ->
+                t.getName().equals("buildpacks-extension-phases") ||
+                t.getName().equals("buildpacks-phases") ||
+                t.getName().equals("jam") ||
+                t.getName().equals("pack"))
             .map(t-> { t.setName("build-container"); return t;}).collect(Collectors.toList());
 
         // @formatter:off