From a093ac07eebbf94ae523d86b584a78a1342082fe Mon Sep 17 00:00:00 2001 From: wangke19 Date: Mon, 29 Dec 2025 14:32:40 +0800 Subject: [PATCH 1/2] fix(oauth-apiserver): 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 --- ...openshift-oauth-apiserver-master__okd-scos.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master__okd-scos.yaml b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master__okd-scos.yaml index a8d077510f94d..1fabd0bc97a53 100644 --- a/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master__okd-scos.yaml +++ b/ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master__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: oauth-apiserver -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 fbc5571e0e8bc5c2180d4d1e6adc5a301043125a Mon Sep 17 00:00:00 2001 From: wangke19 Date: Mon, 29 Dec 2025 14:39:57 +0800 Subject: [PATCH 2/2] fix(oauth-apiserver): generated jobs after config update --- ...ft-oauth-apiserver-master-postsubmits.yaml | 62 ------------------- ...ift-oauth-apiserver-master-presubmits.yaml | 1 - .../openshift/mapping_origin_scos-4_22 | 1 - 3 files changed, 64 deletions(-) diff --git a/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-postsubmits.yaml b/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-postsubmits.yaml index ec3cd1215304c..5df8d77f2c2f7 100644 --- a/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-postsubmits.yaml @@ -58,65 +58,3 @@ postsubmits: - name: result-aggregator secret: secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^master$ - 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-oauth-apiserver-master-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/oauth-apiserver/openshift-oauth-apiserver-master-presubmits.yaml b/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-presubmits.yaml index 15f70e218965b..6809a510dcf3e 100644 --- a/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-presubmits.yaml @@ -442,7 +442,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..7e69d81d0ab66 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 +++ b/core-services/image-mirroring/openshift/mapping_origin_scos-4_22 @@ -144,7 +144,6 @@ registry.ci.openshift.org/origin/scos-4.22:network-tools quay.io/openshift/origi registry.ci.openshift.org/origin/scos-4.22:networking-console-plugin quay.io/openshift/origin-networking-console-plugin:4.22 quay.io/openshift/origin-networking-console-plugin:4.22.0 quay.io/openshift/origin-networking-console-plugin:latest registry.ci.openshift.org/origin/scos-4.22:nutanix-cloud-controller-manager quay.io/openshift/origin-nutanix-cloud-controller-manager:4.22 quay.io/openshift/origin-nutanix-cloud-controller-manager:4.22.0 quay.io/openshift/origin-nutanix-cloud-controller-manager:latest registry.ci.openshift.org/origin/scos-4.22:nutanix-machine-controllers quay.io/openshift/origin-nutanix-machine-controllers:4.22 quay.io/openshift/origin-nutanix-machine-controllers:4.22.0 quay.io/openshift/origin-nutanix-machine-controllers:latest -registry.ci.openshift.org/origin/scos-4.22:oauth-apiserver quay.io/openshift/origin-oauth-apiserver:4.22 quay.io/openshift/origin-oauth-apiserver:4.22.0 quay.io/openshift/origin-oauth-apiserver:latest registry.ci.openshift.org/origin/scos-4.22:oauth-proxy quay.io/openshift/origin-oauth-proxy:4.22 quay.io/openshift/origin-oauth-proxy:4.22.0 quay.io/openshift/origin-oauth-proxy:latest registry.ci.openshift.org/origin/scos-4.22:oauth-server quay.io/openshift/origin-oauth-server:4.22 quay.io/openshift/origin-oauth-server:4.22.0 quay.io/openshift/origin-oauth-server:latest registry.ci.openshift.org/origin/scos-4.22:oc-mirror quay.io/openshift/origin-oc-mirror:4.22 quay.io/openshift/origin-oc-mirror:4.22.0 quay.io/openshift/origin-oc-mirror:latest