Konflux: fbc fixes

.tekton/fbc-pipeline.yaml

@@ -108,7 +108,7 @@ spec:
           - name: name
             value: init
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:737682d073a65a486d59b2b30e3104b93edd8490e0cd5e9b4a39703e47363f0f
+            value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:38660e69f8a8b8bedc0264964d8811e1faaaaaa03a9fc908e811bf8f705f393a
           - name: kind
             value: task
         resolver: bundles
@@ -129,7 +129,7 @@ spec:
           - name: name
             value: git-clone-oci-ta
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:9709088bf3c581d4763e9804d9ee3a1f06ad6a61c23237277057c4f0cdc4f9c3
+            value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:88367f7e80d282237f6cbe9bcc76ac9a72c3f379983d3c3ccba21d767da7d49f
           - name: kind
             value: task
         resolver: bundles
@@ -155,12 +155,12 @@ spec:
         - clone-repository
       taskRef:
         params:
-        - name: name
-          value: prefetch-dependencies-oci-ta
-        - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:153ef0382deef840d155f5146f134f39b480523a7d5c38ba9fea2b58792dd4b5
-        - name: kind
-          value: task
+          - name: name
+            value: prefetch-dependencies-oci-ta
+          - name: bundle
+            value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:153ef0382deef840d155f5146f134f39b480523a7d5c38ba9fea2b58792dd4b5
+          - name: kind
+            value: task
         resolver: bundles
       workspaces:
         - name: git-basic-auth
@@ -206,7 +206,7 @@ spec:
           - name: name
             value: buildah-remote-oci-ta
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:1d26a89f1ad48279999cdcad3cb5ce43dc08620a6c07d8dfe5cc9c9e17622551
+            value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:57a4a8b37d7bf486f419b4a6a540cdffafb27717935b05a91f12d6d9cf663b74
           - name: kind
             value: task
         resolver: bundles
@@ -236,7 +236,7 @@ spec:
           - name: name
             value: build-image-index
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:95be274b6d0432d4671e2c41294ec345121bdf01284b1c6c46b5537dc6b37e15
+            value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:4d5ab47286c1c7ac525786c9a4d0cce9fc73f22635cd623f1d2d12ebc76d83e5
           - name: kind
             value: task
         resolver: bundles
@@ -278,7 +278,7 @@ spec:
           - name: name
             value: apply-tags
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:61c90b1c94a2a11cb11211a0d65884089b758c34254fcec164d185a402beae22
+            value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:4973fa42a8f06238613447fbdb3d0c55eb2d718fd16f2f2591a577c29c1edb17
           - name: kind
             value: task
         resolver: bundles
@@ -346,7 +346,7 @@ spec:
           - name: name
             value: fbc-fips-check-oci-ta
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:3bf1f0921fe828adf16b547e5a52890130b6d1da15783fad3440747eaf9ddc53
+            value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:339b659ebab9317174c644ed897d4929a030695aad2649de68c42ea481d77bcc
           - name: kind
             value: task
       when:

.tekton/fbc-v4-16-pull-request.yaml

@@ -8,7 +8,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "fbc-4.16"
+      == "fbc"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fbc-v4-16
@@ -33,7 +33,9 @@ spec:
     - name: hermetic
       value: "true"
     - name: BUILD_ARGS
-      value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16'
+      value:
+        - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16'
+        - 'OCP_VERSION=fbc-v4-16'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-16-push.yaml

@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "fbc-4.16"
+      == "fbc"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fbc-v4-16
@@ -30,7 +30,9 @@ spec:
     - name: hermetic
       value: "true"
     - name: BUILD_ARGS
-      value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16'
+      value:
+        - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16'
+        - 'OCP_VERSION=fbc-v4-16'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-17-pull-request.yaml

@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "fbc-4.17"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-4-17
-    appstudio.openshift.io/component: fbc-4-17
+    appstudio.openshift.io/application: fbc-v4-17
+    appstudio.openshift.io/component: fbc-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-4-17-on-pull-request
+  name: fbc-v4-17-on-pull-request
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -25,15 +25,17 @@ spec:
     - name: image-expires-after
       value: 5d
     - name: output-image
-      value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-4-17/fbc-4-17:on-pr-{{revision}}
+      value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-17/fbc-v4-17:on-pr-{{revision}}
     - name: path-context
       value: .
     - name: revision
       value: '{{revision}}'
     - name: hermetic
       value: "true"
     - name: BUILD_ARGS
-      value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17'
+      value:
+        - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17'
+        - 'OCP_VERSION=fbc-v4-17'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-17-push.yaml

@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "fbc-4.16"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-v4-16
-    appstudio.openshift.io/component: fbc-v4-16
+    appstudio.openshift.io/application: fbc-v4-17
+    appstudio.openshift.io/component: fbc-v4-17
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-v4-16-on-push
+  name: fbc-v4-17-on-push
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -22,15 +22,17 @@ spec:
     - name: git-url
       value: '{{source_url}}'
     - name: output-image
-      value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-16/fbc-v4-16:{{revision}}
+      value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-17/fbc-v4-17:{{revision}}
     - name: path-context
       value: .
     - name: revision
       value: '{{revision}}'
     - name: hermetic
       value: "true"
     - name: BUILD_ARGS
-      value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16'
+      value:
+        - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17'
+        - 'OCP_VERSION=fbc-v4-17'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-18-pull-request.yaml

@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "fbc-4.18"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-4-18
-    appstudio.openshift.io/component: fbc-4-18
+    appstudio.openshift.io/application: fbc-v4-18
+    appstudio.openshift.io/component: fbc-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-4-18-on-pull-request
+  name: fbc-v4-18-on-pull-request
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -25,15 +25,17 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-4-18/fbc-4-18:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-18/fbc-v4-18:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision
     value: '{{revision}}'
   - name: hermetic
     value: "true"
   - name: BUILD_ARGS
-    value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18'
+    value:
+      - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18'
+      - 'OCP_VERSION=fbc-v4-18'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-18-push.yaml

@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "fbc-4.18"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-4-18
-    appstudio.openshift.io/component: fbc-4-18
+    appstudio.openshift.io/application: fbc-v4-18
+    appstudio.openshift.io/component: fbc-v4-18
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-4-18-on-push
+  name: fbc-v4-18-on-push
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -22,15 +22,17 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-4-18/fbc-4-18:{{revision}}
+    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-18/fbc-v4-18:{{revision}}
   - name: path-context
     value: .
   - name: revision
     value: '{{revision}}'
   - name: hermetic
     value: "true"
   - name: BUILD_ARGS
-    value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18'
+    value:
+      - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18'
+      - 'OCP_VERSION=fbc-v4-18'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-19-pull-request.yaml

@@ -8,13 +8,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "fbc-4.19"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-4-19
-    appstudio.openshift.io/component: fbc-4-19
+    appstudio.openshift.io/application: fbc-v4-19
+    appstudio.openshift.io/component: fbc-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-4-19-on-pull-request
+  name: fbc-v4-19-on-pull-request
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -25,15 +25,17 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: output-image
-    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-4-19/fbc-4-19:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-19/fbc-v4-19:on-pr-{{revision}}
   - name: path-context
     value: .
   - name: revision
     value: '{{revision}}'
   - name: hermetic
     value: "true"
   - name: BUILD_ARGS
-    value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19'
+    value:
+      - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19'
+      - 'OCP_VERSION=fbc-v4-19'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

.tekton/fbc-v4-19-push.yaml

@@ -7,13 +7,13 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "fbc-4.19"
+      == "fbc"
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: fbc-4-19
-    appstudio.openshift.io/component: fbc-4-19
+    appstudio.openshift.io/application: fbc-v4-19
+    appstudio.openshift.io/component: fbc-v4-19
     pipelines.appstudio.openshift.io/type: build
-  name: fbc-4-19-on-push
+  name: fbc-v4-19-on-push
   namespace: multiarch-tuning-ope-tenant
 spec:
   params:
@@ -22,15 +22,17 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-4-19/fbc-4-19:{{revision}}
+    value: quay.io/redhat-user-workloads/multiarch-tuning-ope-tenant/fbc-v4-19/fbc-v4-19:{{revision}}
   - name: path-context
     value: .
   - name: revision
     value: '{{revision}}'
   - name: hermetic
     value: "true"
   - name: BUILD_ARGS
-    value: 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19'
+    value:
+      - 'BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19'
+      - 'OCP_VERSION=fbc-v4-19'
   taskRunTemplate: {}
   pipelineRef:
     name: fbc-pipeline

fbc-v4-18/Dockerfile → Dockerfile

@@ -2,14 +2,15 @@
 # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
 ARG BASE_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
 FROM ${BASE_IMAGE}
+ARG OCP_VERSION=fbc-v4-18
 
 # Configure the entrypoint and command
 ENTRYPOINT ["/bin/opm"]
 CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]
 
-ADD ../licenses /licenses/
+ADD licenses/ /licenses/
 # Copy declarative config root into image at /configs and pre-populate serve cache
-ADD catalog /configs
+ADD ${OCP_VERSION}/catalog/ /configs
 RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
 
 # Set DC-specific label for the location of the DC root directory