From b82a79739154e019f16e76cf39c0a5fb86a27a5f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 5 Aug 2022 13:47:48 -0400 Subject: [PATCH] openshift/os: Explicitly promote into ocp/4.12 imagestream Followup to https://github.com/openshift/os/issues/940 We changed the image name, but to succeed in landing the MCO changes to use `rhel-coreos-8` we need an image named `rhel-coreos-8` in the integration imagestream. Closes: https://github.com/openshift/os/issues/943 --- .../config/openshift/os/openshift-os-master__periodic.yaml | 7 ++----- .../jobs/openshift/os/openshift-os-master-postsubmits.yaml | 2 -- .../jobs/openshift/os/openshift-os-master-presubmits.yaml | 3 +-- .../image-mirroring/openshift/mapping_origin_4_12 | 2 ++ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml index 5789ca3a0ee16..f8d615dffecca 100644 --- a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml @@ -106,14 +106,11 @@ images: - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest to: rhel-coreos-8-extensions promotion: - additional_images: - rhel-coreos-8: rhel-coreos-8 - rhel-coreos-8-extensions: rhel-coreos-8-extensions excluded_images: - oci-archive - build-image - namespace: rhcos-devel - tag: latest + name: "4.12" + namespace: ocp releases: initial: integration: diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml index e7b56912e278d..e0ad01d03350b 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml @@ -77,8 +77,6 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] - - --target=rhel-coreos-8 - - --target=rhel-coreos-8-extensions - --variant=periodic command: - ci-operator diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml index 6f63a21b3ded4..28b1a03627d41 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml @@ -74,8 +74,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --target=rhel-coreos-8 - - --target=rhel-coreos-8-extensions + - --target=[release:latest] - --variant=periodic command: - ci-operator diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_12 b/core-services/image-mirroring/openshift/mapping_origin_4_12 index 7159820440abf..09e585679d224 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_4_12 +++ b/core-services/image-mirroring/openshift/mapping_origin_4_12 @@ -272,6 +272,8 @@ registry.ci.openshift.org/origin/4.12:ptp quay.io/openshift/origin-ptp:4.12 quay registry.ci.openshift.org/origin/4.12:ptp-operator quay.io/openshift/origin-ptp-operator:4.12 quay.io/openshift/origin-ptp-operator:4.12.0 quay.io/openshift/origin-ptp-operator:latest registry.ci.openshift.org/origin/4.12:recycler quay.io/openshift/origin-recycler:4.12 quay.io/openshift/origin-recycler:4.12.0 quay.io/openshift/origin-recycler:latest registry.ci.openshift.org/origin/4.12:redhat-subscription-injection-webhook quay.io/openshift/origin-redhat-subscription-injection-webhook:4.12 quay.io/openshift/origin-redhat-subscription-injection-webhook:4.12.0 quay.io/openshift/origin-redhat-subscription-injection-webhook:latest +registry.ci.openshift.org/origin/4.12:rhel-coreos-8 quay.io/openshift/origin-rhel-coreos-8:4.12 quay.io/openshift/origin-rhel-coreos-8:4.12.0 quay.io/openshift/origin-rhel-coreos-8:latest +registry.ci.openshift.org/origin/4.12:rhel-coreos-8-extensions quay.io/openshift/origin-rhel-coreos-8-extensions:4.12 quay.io/openshift/origin-rhel-coreos-8-extensions:4.12.0 quay.io/openshift/origin-rhel-coreos-8-extensions:latest registry.ci.openshift.org/origin/4.12:sdn quay.io/openshift/origin-sdn:4.12 quay.io/openshift/origin-sdn:4.12.0 quay.io/openshift/origin-sdn:latest registry.ci.openshift.org/origin/4.12:secondary-scheduler-operator quay.io/openshift/origin-secondary-scheduler-operator:4.12 quay.io/openshift/origin-secondary-scheduler-operator:4.12.0 quay.io/openshift/origin-secondary-scheduler-operator:latest registry.ci.openshift.org/origin/4.12:self-node-remediation-index quay.io/openshift/origin-self-node-remediation-index:4.12 quay.io/openshift/origin-self-node-remediation-index:4.12.0 quay.io/openshift/origin-self-node-remediation-index:latest