konflux: migrate to build 0.2

https://github.com/konflux-ci/build-definitions/blob/main/task/buildah/0.2/MIGRATION.md Also fix the make build-image target so it does not use the QUARKUS_EXTENSIONS from the argfile, but instead use the default from the dockerfile Signed-off-by: Roy Golan <[email protected]>
rhdhorchestrator · Aug 12, 2024 · e64be16 · e64be16
1 parent f2688c6
commit e64be16
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 29 deletions.
diff --git a/.tekton/move2kube-serverless-workflow-pull-request.yaml b/.tekton/move2kube-serverless-workflow-pull-request.yaml
@@ -253,8 +253,6 @@ spec:
       params:
       - name: BINARY_IMAGE
         value: $(params.output-image)
-      - name: BASE_IMAGES
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       runAfter:
       - build-container
       taskRef:
@@ -280,8 +278,6 @@ spec:
         workspace: workspace
     - name: deprecated-base-image-check
       params:
-      - name: BASE_IMAGES_DIGESTS
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       - name: IMAGE_URL
         value: $(tasks.build-container.results.IMAGE_URL)
       - name: IMAGE_DIGEST

diff --git a/.tekton/move2kube-serverless-workflow-push.yaml b/.tekton/move2kube-serverless-workflow-push.yaml
@@ -249,8 +249,6 @@ spec:
       params:
       - name: BINARY_IMAGE
         value: $(params.output-image)
-      - name: BASE_IMAGES
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       runAfter:
       - build-container
       taskRef:
@@ -276,8 +274,6 @@ spec:
         workspace: workspace
     - name: deprecated-base-image-check
       params:
-      - name: BASE_IMAGES_DIGESTS
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       - name: IMAGE_URL
         value: $(tasks.build-container.results.IMAGE_URL)
       - name: IMAGE_DIGEST

diff --git a/.tekton/mta-serverless-workflow-pull-request.yaml b/.tekton/mta-serverless-workflow-pull-request.yaml
@@ -253,8 +253,6 @@ spec:
       params:
       - name: BINARY_IMAGE
         value: $(params.output-image)
-      - name: BASE_IMAGES
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       runAfter:
       - build-container
       taskRef:
@@ -280,8 +278,6 @@ spec:
         workspace: workspace
     - name: deprecated-base-image-check
       params:
-      - name: BASE_IMAGES_DIGESTS
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       - name: IMAGE_URL
         value: $(tasks.build-container.results.IMAGE_URL)
       - name: IMAGE_DIGEST

diff --git a/.tekton/mta-serverless-workflow-push.yaml b/.tekton/mta-serverless-workflow-push.yaml
@@ -249,8 +249,6 @@ spec:
       params:
       - name: BINARY_IMAGE
         value: $(params.output-image)
-      - name: BASE_IMAGES
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       runAfter:
       - build-container
       taskRef:
@@ -276,8 +274,6 @@ spec:
         workspace: workspace
     - name: deprecated-base-image-check
       params:
-      - name: BASE_IMAGES_DIGESTS
-        value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
       - name: IMAGE_URL
         value: $(tasks.build-container.results.IMAGE_URL)
       - name: IMAGE_DIGEST

diff --git a/Makefile b/Makefile
@@ -21,6 +21,12 @@ $(WORKFLOWS):
 	$(eval WORKFLOW_ID="$@")
 	@echo Specify one of the targets: build-image, push-image, gen-manifests, push-manifests
 
+# Empty value is used to work with the default builder image from the dockerfile.
+BUILDER_IMAGE = ""
+
+# Empty value is used to work with the default quarkus extensions list from the dockerfile.
+QUARKUS_EXTENSIONS = ""
+
 ifndef APPLICATION_ID
 APPLICATION_ID = UNDEFINED
 endif
@@ -122,7 +128,7 @@ prepare-workdir:
 # Depends on: prepare-workdir target.
 # Usage: make build-image
 ifeq ($(IS_WORKFLOW),true)
-build-image: BUILD_ARGS=--build-arg-file=$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg WF_RESOURCES=$(WORKFLOW_ID)
+build-image: BUILD_ARGS=--build-arg-file=$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg=QUARKUS_EXTENSIONS=$(QUARKUS_EXTENSIONS) --build-arg WF_RESOURCES=$(WORKFLOW_ID)
 endif
 build-image: EXTRA_ARGS=--ulimit nofile=4096:4096
 build-image: prepare-workdir

diff --git a/create-ocp-project/argfile.conf b/create-ocp-project/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=create-ocp-project Serverless Workflow
 FLOW_SUMMARY=create-ocp-project Serverless Workflow
 FLOW_DESCRIPTION=create-ocp-project workflow consumes a source code repo and pushes a branch with manifests and build files to containerize and application
diff --git a/escalation/argfile.conf b/escalation/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=escalation
 FLOW_SUMMARY=Ticket escalation workflow
 FLOW_DESCRIPTION=Ticket escalation workflow
diff --git a/escalation/jira-listener/argfile.conf b/escalation/jira-listener/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=jira-listener
 FLOW_SUMMARY=jira-listener application
 FLOW_DESCRIPTION=jira-listener application
diff --git a/greeting/argfile.conf b/greeting/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=Greeting
 FLOW_SUMMARY=Greeting workflow
 FLOW_DESCRIPTION=YAML based greeting workflow
diff --git a/modify-vm-resources/argfile.conf b/modify-vm-resources/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=modify-vm-resources Serverless Workflow
 FLOW_SUMMARY=modify-vm-resources Serverless Workflow
 FLOW_DESCRIPTION=modify-vm-resources workflow consumes a source code repo and pushes a branch with manifests and build files to containerize and application
diff --git a/move2kube/argfile.conf b/move2kube/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=move2kube Serverless Workflow
 FLOW_SUMMARY=move2kube Serverless Workflow
 FLOW_DESCRIPTION=move2kube workflow consumes a source code repo and pushes a branch with manifests and build files to containerize and application
diff --git a/mta-v6.x/argfile.conf b/mta-v6.x/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=MTA v6.x Serverless Workflow
 FLOW_SUMMARY=MTA v6.x Serverless Workflow
 FLOW_DESCRIPTION=MTA v6.x workflow consumes a source code repo and asses if it can be migrated
diff --git a/mta-v7.x/argfile.conf b/mta-v7.x/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=MTA v7.x Serverless Workflow
 FLOW_SUMMARY=MTA v7.x Serverless Workflow
 FLOW_DESCRIPTION=MTA v7.x workflow consumes a source code repo and asses if it can be migrated
diff --git a/mta/argfile.conf b/mta/argfile.conf
@@ -1,4 +1,9 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
+
 FLOW_NAME=MTA Analysis
 FLOW_SUMMARY=MTA Analysis serverless workflow consumes a source code repository and executes an MTA analysis using Migration ToolKit for Applications
 FLOW_DESCRIPTION=MTA Analysis serverless workflow consumes a source code repository and executes an MTA analysis using Migration ToolKit for Applications
diff --git a/mtv-migration/argfile.conf b/mtv-migration/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=MTV migration workflow
 FLOW_SUMMARY=MTV migration workflow
 FLOW_DESCRIPTION=The workflow executes a plan by creating a migration and waiting for it to be successful or failed
diff --git a/mtv-plan/argfile.conf b/mtv-plan/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=MTV plan workflow
 FLOW_SUMMARY=MTV plan assessment workflow
 FLOW_DESCRIPTION=An assessment workflow that creates a plan and waits for it to be ready or failed
diff --git a/request-vm-cnv/argfile.conf b/request-vm-cnv/argfile.conf
@@ -1,4 +1,8 @@
-BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:012439f21f964478225a459042f6e1dc14f63fdf4ae089c4ee5e613814682a27
+BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-serverless-1/logic-swf-builder-rhel8@sha256:838593bd7907e317f0a2f1183441d3b3edcdc830e06a292f92eb25b437fa4955
+
+# FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+
 FLOW_NAME=request-vm-cnv Serverless Workflow
 FLOW_SUMMARY=request-vm-cnv Serverless Workflow
 FLOW_DESCRIPTION=request-vm-cnv workflow consumes a source code repo and pushes a branch with manifests and build files to containerize and application