Skip to content

fix(hypershift): revert okd jobs back to 4.21 #72920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Dec 23, 2025
Merged

fix(hypershift): revert okd jobs back to 4.21 #72920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7dc9d1
fix(hypershift): revert okd jobs back to 4.21
devguyio Dec 23, 2025
a8d0557
fix(hypershift): run make jobs
devguyio Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ci-operator/config/openshift/hypershift/openshift-hypershift-main__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,15 +24,11 @@ images:
- builder
- registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
to: hypershift
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:
'*':
Expand Down
62 changes: 0 additions & 62 deletions ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,65 +60,3 @@ postsubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
always_run: true
branches:
- ^main$
cluster: build09
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-hypershift-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
1 change: 0 additions & 1 deletion ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,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
Expand Down
1 change: 0 additions & 1 deletion core-services/image-mirroring/openshift/mapping_origin_scos-4_22
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ registry.ci.openshift.org/origin/scos-4.22:gcp-workload-identity-federation-webh
registry.ci.openshift.org/origin/scos-4.22:haproxy-router quay.io/openshift/origin-haproxy-router:4.22 quay.io/openshift/origin-haproxy-router:4.22.0 quay.io/openshift/origin-haproxy-router:latest
registry.ci.openshift.org/origin/scos-4.22:haproxy-router-base quay.io/openshift/origin-haproxy-router-base:4.22 quay.io/openshift/origin-haproxy-router-base:4.22.0 quay.io/openshift/origin-haproxy-router-base:latest
registry.ci.openshift.org/origin/scos-4.22:hyperkube quay.io/openshift/origin-hyperkube:4.22 quay.io/openshift/origin-hyperkube:4.22.0 quay.io/openshift/origin-hyperkube:latest
registry.ci.openshift.org/origin/scos-4.22:hypershift quay.io/openshift/origin-hypershift:4.22 quay.io/openshift/origin-hypershift:4.22.0 quay.io/openshift/origin-hypershift:latest
registry.ci.openshift.org/origin/scos-4.22:ibm-cloud-controller-manager quay.io/openshift/origin-ibm-cloud-controller-manager:4.22 quay.io/openshift/origin-ibm-cloud-controller-manager:4.22.0 quay.io/openshift/origin-ibm-cloud-controller-manager:latest
registry.ci.openshift.org/origin/scos-4.22:ibm-vpc-block-csi-driver quay.io/openshift/origin-ibm-vpc-block-csi-driver:4.22 quay.io/openshift/origin-ibm-vpc-block-csi-driver:4.22.0 quay.io/openshift/origin-ibm-vpc-block-csi-driver:latest
registry.ci.openshift.org/origin/scos-4.22:ibm-vpc-block-csi-driver-operator quay.io/openshift/origin-ibm-vpc-block-csi-driver-operator:4.22 quay.io/openshift/origin-ibm-vpc-block-csi-driver-operator:4.22.0 quay.io/openshift/origin-ibm-vpc-block-csi-driver-operator:latest
Expand Down