From 010a2849292c5bfeb11a25e3df8c680db1207b63 Mon Sep 17 00:00:00 2001 From: Puskar Basu Date: Tue, 14 Jul 2026 19:04:41 +0530 Subject: [PATCH 1/2] OKD-387: Fix SCOS 4.22 building cri-o 1.36 from master instead of release-4.22 The openshift/os master__okd-scos CI config builds from the master branch and promotes to scos-4.22. When master moved to target 5.0, c10s.repo was updated to point c10s-sig-cloud-okd at the okd-5.0 package repo, which contains cri-o 1.36.x instead of 1.35.x. Create a dedicated release-4.22__okd-scos config that builds from the release-4.22 branch (where c10s.repo correctly points to okd-4.22/), and remove scos-4.22 promotion from the master config. --- .../os/openshift-os-master__okd-scos.yaml | 6 +- .../openshift-os-release-4.22__okd-scos.yaml | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml diff --git a/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml index 4b339ddaa9cd8..0bc102349dbe7 100644 --- a/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml @@ -49,10 +49,6 @@ images: to: stream-coreos-extensions promotion: to: - - name: scos-4.22 - namespace: origin - - name: scos-4.22-art - namespace: origin - name: scos-5.0 namespace: origin - name: scos-5.0-art @@ -61,7 +57,7 @@ releases: latest: integration: include_built_images: true - name: scos-4.22 + name: scos-5.0 namespace: origin resources: '*': diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml new file mode 100644 index 0000000000000..a71ec34371ec6 --- /dev/null +++ b/ci-operator/config/openshift/os/openshift-os-release-4.22__okd-scos.yaml @@ -0,0 +1,66 @@ +base_images: + ocp_builder_stream: + name: builder + namespace: ocp + tag: stream10 + stream-coreos-base: + name: stream-coreos-base + namespace: coreos + tag: "10" +build_root: + image_stream_tag: + name: coreos-assembler + namespace: coreos + tag: latest +images: + items: + - build_args: + - name: OPENSHIFT_CI + value: "1" + dockerfile_path: Containerfile + inputs: + stream-coreos-base: + as: + - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos + to: stream-coreos + - build_args: + - name: OPENSHIFT_CI + value: "1" + dockerfile_path: extensions/Containerfile + inputs: + ocp_builder_stream: + as: + - registry.access.redhat.com/ubi9/ubi:latest + stream-coreos: + as: + - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest + to: stream-coreos-extensions +promotion: + to: + - name: scos-4.22 + namespace: origin + - name: scos-4.22-art + namespace: origin +releases: + latest: + integration: + include_built_images: true + name: scos-4.22 + namespace: origin +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- always_run: false + as: e2e-aws-ovn + optional: true + steps: + cluster_profile: openshift-org-aws + workflow: openshift-e2e-aws +zz_generated_metadata: + branch: release-4.22 + org: openshift + repo: os + variant: okd-scos From 818f40f65f85feef5ab8e61084b52c4bd8b74f40 Mon Sep 17 00:00:00 2001 From: Puskar Basu Date: Tue, 14 Jul 2026 19:11:01 +0530 Subject: [PATCH 2/2] Regenerate Prow jobs for openshift/os release-4.22 okd-scos variant --- ...openshift-os-release-4.22-postsubmits.yaml | 64 ++++++++ .../openshift-os-release-4.22-presubmits.yaml | 147 ++++++++++++++++++ 2 files changed, 211 insertions(+) diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml index e3b6fe0c14ec6..2f947638f9121 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.22-postsubmits.yaml @@ -62,3 +62,67 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + cluster: build01 + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + - extensions/Containerfile + labels: + ci-operator.openshift.io/is-promotion: "true" + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-os-release-4.22-okd-scos-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=okd-scos + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/push-secret + name: push-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml index d61085ef97409..e011c1f47e6bf 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.22-presubmits.yaml @@ -144,3 +144,150 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build03 + context: ci/prow/okd-scos-e2e-aws-ovn + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + - extensions/Containerfile + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-release-4.22-okd-scos-e2e-aws-ovn + optional: true + rerun_command: /test okd-scos-e2e-aws-ovn + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ovn + - --variant=okd-scos + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.22$ + - ^release-4\.22- + cluster: build06 + context: ci/prow/okd-scos-images + decorate: true + decoration_config: + sparse_checkout_files: + - Containerfile + - extensions/Containerfile + labels: + ci-operator.openshift.io/variant: okd-scos + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-release-4.22-okd-scos-images + rerun_command: /test okd-scos-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --target=[release:latest] + - --variant=okd-scos + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*)