From 3cf3daf2a0d236db83789f3944ab568965d569f7 Mon Sep 17 00:00:00 2001 From: wangke19 Date: Mon, 29 Dec 2025 14:58:41 +0800 Subject: [PATCH 1/2] fix(service-ca-operator): revert okd-scos jobs back to 4.21 For 4.22, scos-4.22:stream-coreos is missing required labels that are causing the okd-scos images job to fail. This should be reverted once that is fixed. Related: https://github.com/coreos/rhel-coreos-config/pull/134 Related: https://github.com/openshift/release/pull/72920 --- ...enshift-service-ca-operator-main__okd-scos.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-main__okd-scos.yaml b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-main__okd-scos.yaml index 4723416760e14..72c288726616a 100644 --- a/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-main__okd-scos.yaml +++ b/ci-operator/config/openshift/service-ca-operator/openshift-service-ca-operator-main__okd-scos.yaml @@ -2,16 +2,16 @@ base_images: ocp_builder_rhel-9-golang-1.24-openshift-4.22: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.22 + tag: rhel-9-golang-1.24-openshift-4.21 origin_scos-4.22_base-stream9: - name: scos-4.22 + name: scos-4.21 namespace: origin tag: base-stream9 build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.22 + tag: rhel-9-release-golang-1.24-openshift-4.21 images: - build_args: - name: TAGS @@ -22,17 +22,13 @@ images: ocp_builder_rhel-9-golang-1.24-openshift-4.22: as: - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 + - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 to: service-ca-operator -promotion: - to: - - name: scos-4.22 - namespace: origin releases: latest: integration: include_built_images: true - name: scos-4.22 + name: scos-4.21 namespace: origin resources: '*': From d96cd3ea6fe26349487ad3515d5cf8e89eaa99f6 Mon Sep 17 00:00:00 2001 From: wangke19 Date: Mon, 29 Dec 2025 14:58:53 +0800 Subject: [PATCH 2/2] fix(service-ca-operator): generated jobs after config update --- ...-service-ca-operator-main-postsubmits.yaml | 62 ------------------- ...t-service-ca-operator-main-presubmits.yaml | 1 - .../openshift/mapping_origin_scos-4_22 | 1 - 3 files changed, 64 deletions(-) diff --git a/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-postsubmits.yaml index d0aaaee3fafef..4dcd4abbddb7c 100644 --- a/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-postsubmits.yaml @@ -58,65 +58,3 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^main$ - cluster: build08 - decorate: true - decoration_config: - skip_cloning: true - 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-service-ca-operator-main-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/service-ca-operator/openshift-service-ca-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-presubmits.yaml index 1f9e7a2d1c6ef..1ab6af89d35bf 100644 --- a/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/service-ca-operator/openshift-service-ca-operator-main-presubmits.yaml @@ -443,7 +443,6 @@ presubmits: - --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 diff --git a/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 b/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 index a50a8f0a8ee09..15088e0f38c89 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 +++ b/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 @@ -179,7 +179,6 @@ registry.ci.openshift.org/origin/scos-4.22:prometheus-node-exporter quay.io/open registry.ci.openshift.org/origin/scos-4.22:prometheus-operator quay.io/openshift/origin-prometheus-operator:4.22 quay.io/openshift/origin-prometheus-operator:4.22.0 quay.io/openshift/origin-prometheus-operator:latest registry.ci.openshift.org/origin/scos-4.22:prometheus-operator-admission-webhook quay.io/openshift/origin-prometheus-operator-admission-webhook:4.22 quay.io/openshift/origin-prometheus-operator-admission-webhook:4.22.0 quay.io/openshift/origin-prometheus-operator-admission-webhook:latest registry.ci.openshift.org/origin/scos-4.22:route-controller-manager quay.io/openshift/origin-route-controller-manager:4.22 quay.io/openshift/origin-route-controller-manager:4.22.0 quay.io/openshift/origin-route-controller-manager:latest -registry.ci.openshift.org/origin/scos-4.22:service-ca-operator quay.io/openshift/origin-service-ca-operator:4.22 quay.io/openshift/origin-service-ca-operator:4.22.0 quay.io/openshift/origin-service-ca-operator:latest registry.ci.openshift.org/origin/scos-4.22:stream-coreos quay.io/openshift/origin-stream-coreos:4.22 quay.io/openshift/origin-stream-coreos:4.22.0 quay.io/openshift/origin-stream-coreos:latest registry.ci.openshift.org/origin/scos-4.22:stream-coreos-extensions quay.io/openshift/origin-stream-coreos-extensions:4.22 quay.io/openshift/origin-stream-coreos-extensions:4.22.0 quay.io/openshift/origin-stream-coreos-extensions:latest registry.ci.openshift.org/origin/scos-4.22:telemeter quay.io/openshift/origin-telemeter:4.22 quay.io/openshift/origin-telemeter:4.22.0 quay.io/openshift/origin-telemeter:latest