Changed microshift-gitops rpm target-distribution to rhel-9

.tekton/build-rpm-package.yaml

@@ -23,7 +23,7 @@ spec:
           - name: name
             value: summary
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:3f6e8513cbd70f0416eb6c6f2766973a754778526125ff33d8e3633def917091
+            value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:526555c9d77ca9e97c52ee6bfcd097fbedc1f3442084367c936af4faa69951e8
           - name: kind
             value: task
         resolver: bundles
@@ -36,7 +36,7 @@ spec:
           - name: name
             value: show-sbom
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:e2c1b4eac642f32e91f3bc5d3cb48c5c70888aaf45c3650d9ea34573de7a7fd5
+            value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:04994df487ee886adbe60a8a5866647fbdfd53cc26f7b2554272ba51bf7af29e
           - name: kind
             value: task
         resolver: bundles
@@ -104,7 +104,7 @@ spec:
         configuration, dist-git-client, koji-client, and other RPM-build related
         tooling.
       name: script-environment-image
-      default: quay.io/redhat-user-workloads/rpm-build-pipeline-tenant/environment:latest@sha256:ffe0421ef0e984b9d27fbcea5de8bcab0dae84a7fdab031daace3cd8f57a8ff8
+      default: quay.io/redhat-user-workloads/rpm-build-pipeline-tenant/environment:latest@sha256:219bba71b1d346ffeb4fc77c1ba7f9f3029aa2bde5270367437be4cab677669b
       type: string
     - name: ociStorage
       description: |
@@ -166,7 +166,7 @@ spec:
       description: Enable cache proxy configuration
       type: string
     - name: target-distribution
-      default: 'fedora-rawhide'
+      default: 'rhel-9'
       description: Target distribution. The pipeline expands spec file using macros from the target distribution. Typically specified as ID-VERSION_ID (see /etc/os-release), e.g., rhel-11
       type: string
     - name: enableSymlinkCheck
@@ -230,7 +230,7 @@ spec:
           - name: name
             value: init
           - name: bundle
-            value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82
+            value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:288f3106118edc1d0f0c79a89c960abf5841a4dd8bc3f38feb10527253105b19
           - name: kind
             value: task
         resolver: bundles
@@ -256,7 +256,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:306b69e6db435ad4a7cf258b6219d9b998eb37da44f5e9ac882ac86a08109154
+            value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:2c388d28651457db60bb90287e7d8c3680303197196e4476878d98d81e8b6dc9
           - name: kind
             value: task
         resolver: bundles
@@ -363,6 +363,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.deps-x86_64)
+        - name: arch
+          value: x86_64
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: dependencies-artifact
@@ -395,6 +397,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.build-x86_64)
+        - name: arch
+          value: x86_64
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: hermetic
@@ -418,6 +422,78 @@ spec:
             value: $(params.self-ref-revision)
           - name: pathInRepo
             value: task/rpmbuild.yaml
+    - name: calculate-deps-i686
+      runAfter:
+        - process-sources
+        - prepare-mock-config
+      params:
+        - name: package-name
+          value: $(params.package-name)
+        - name: target-branch
+          value: $(params.target-branch)
+        - name: mock-config-template-file
+          value: $(tasks.prepare-mock-config.results.mock-config-template-file)
+        - name: PLATFORM
+          value: $(tasks.process-sources.results.skip-mpc-tasks.deps-i686)
+        - name: arch
+          value: i686
+        - name: script-environment-image
+          value: $(params.script-environment-image)
+        - name: dependencies-artifact
+          value: $(tasks.process-sources.results.dependencies-artifact)
+        - name: ociStorage
+          value: $(params.ociStorage).calculation-i686
+        - name: ociArtifactExpiresAfter
+          value: $(params.ociArtifactExpiresAfter)
+        - name: specfile
+          value: $(params.specfile)
+      taskRef:
+        resolver: git
+        params:
+          - name: url
+            value: $(params.self-ref-url)
+          - name: revision
+            value: $(params.self-ref-revision)
+          - name: pathInRepo
+            value: task/calculate-deps.yaml
+    - name: rpmbuild-i686
+      runAfter:
+        - calculate-deps-i686
+      timeout: "72h"
+      params:
+        - name: package-name
+          value: $(params.package-name)
+        - name: target-branch
+          value: $(params.target-branch)
+        - name: mock-config-template-file
+          value: $(tasks.prepare-mock-config.results.mock-config-template-file)
+        - name: PLATFORM
+          value: $(tasks.process-sources.results.skip-mpc-tasks.build-i686)
+        - name: arch
+          value: i686
+        - name: script-environment-image
+          value: $(params.script-environment-image)
+        - name: hermetic
+          value: $(params.hermetic)
+        - name: dependencies-artifact
+          value: $(tasks.process-sources.results.dependencies-artifact)
+        - name: calculation-artifact
+          value: $(tasks.calculate-deps-i686.results.calculation-artifact)
+        - name: ociStorage
+          value: $(params.ociStorage).rpmbuild-i686
+        - name: ociArtifactExpiresAfter
+          value: $(params.ociArtifactExpiresAfter)
+        - name: specfile
+          value: $(params.specfile)
+      taskRef:
+        resolver: git
+        params:
+          - name: url
+            value: $(params.self-ref-url)
+          - name: revision
+            value: $(params.self-ref-revision)
+          - name: pathInRepo
+            value: task/rpmbuild.yaml
     - name: calculate-deps-aarch64
       runAfter:
         - process-sources
@@ -431,6 +507,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.deps-aarch64)
+        - name: arch
+          value: aarch64
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: dependencies-artifact
@@ -463,6 +541,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.build-aarch64)
+        - name: arch
+          value: aarch64
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: hermetic
@@ -499,6 +579,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.deps-s390x)
+        - name: arch
+          value: s390x
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: dependencies-artifact
@@ -531,6 +613,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.build-s390x)
+        - name: arch
+          value: s390x
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: hermetic
@@ -567,6 +651,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.deps-ppc64le)
+        - name: arch
+          value: ppc64le
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: dependencies-artifact
@@ -599,6 +685,8 @@ spec:
           value: $(tasks.prepare-mock-config.results.mock-config-template-file)
         - name: PLATFORM
           value: $(tasks.process-sources.results.skip-mpc-tasks.build-ppc64le)
+        - name: arch
+          value: ppc64le
         - name: script-environment-image
           value: $(params.script-environment-image)
         - name: hermetic
@@ -638,6 +726,8 @@ spec:
           value: $(context.pipelineRun.namespace)/$(context.pipelineRun.name)
         - name: x86_64-artifact
           value: $(tasks.rpmbuild-x86-64.results.rpmbuild-artifact)
+        - name: i686-artifact
+          value: $(tasks.rpmbuild-i686.results.rpmbuild-artifact)
         - name: aarch64-artifact
           value: $(tasks.rpmbuild-aarch64.results.rpmbuild-artifact)
         - name: s390x-artifact
@@ -649,6 +739,7 @@ spec:
       runAfter:
         - rpmbuild-s390x
         - rpmbuild-x86-64
+        - rpmbuild-i686
         - rpmbuild-aarch64
         - rpmbuild-ppc64le
       taskRef:
@@ -664,9 +755,12 @@ spec:
       runAfter:
         - rpmbuild-s390x
         - rpmbuild-x86-64
+        - rpmbuild-i686
         - rpmbuild-aarch64
         - rpmbuild-ppc64le
       params:
+        - name: i686-artifact
+          value: $(tasks.rpmbuild-i686.results.rpmbuild-artifact)
         - name: x86_64-artifact
           value: $(tasks.rpmbuild-x86-64.results.rpmbuild-artifact)
         - name: aarch64-artifact
@@ -688,4 +782,4 @@ spec:
             value: task/check-noarch.yaml
   workspaces:
     - name: git-auth
-      optional: true
+      optional: true

.tekton/rpm-microshift-gitops-pull-request.yaml

@@ -37,7 +37,7 @@ spec:
   - name: self-ref-url
     value: "https://github.com/konflux-ci/rpmbuild-pipeline.git"
   - name: self-ref-revision
-    value: "8153cd094db31d2397f04a312dfb71747e46e0aa"
+    value: "1eb8d257a641b144883d7843efd6b9f2d2b2774c"
   - name: pre-build-task-url
     value: '{{source_url}}'
   - name: pre-build-task-revision
@@ -59,7 +59,7 @@ spec:
       echo "--- Creating argo-cd-sources.tar.gz from correct internal directory  ---"
       cd rpms/microshift-gitops
       ./generate-microshift-gitops-spec.sh
-      echo "--- DONE PRE-script  ---"
+      echo "--- DONE pre-build-script  ---"
   - name: enableSymlinkCheck
     value: false
   pipelineRef:

.tekton/rpm-microshift-gitops-push.yaml

@@ -36,7 +36,7 @@ spec:
   - name: self-ref-url
     value: "https://github.com/konflux-ci/rpmbuild-pipeline.git"
   - name: self-ref-revision
-    value: "8153cd094db31d2397f04a312dfb71747e46e0aa"
+    value: "1eb8d257a641b144883d7843efd6b9f2d2b2774c"
   - name: pre-build-task-url
     value: '{{source_url}}'
   - name: pre-build-task-revision