From 571687d719c45638532cfc42e50696240618b512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 8 Jun 2022 13:02:55 +0200 Subject: [PATCH 1/3] ci-operator/openshift/os: Use 4.11 builders for 4.11+ --- ci-operator/config/openshift/os/openshift-os-master.yaml | 8 ++++---- .../config/openshift/os/openshift-os-release-4.11.yaml | 8 ++++---- .../config/openshift/os/openshift-os-release-4.12.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index edf00e029841c..203c04e84f3ba 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -7,10 +7,10 @@ base_images: name: fedora namespace: coreos tag: "35" - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 + tag: rhel-8-golang-1.17-openshift-4.11 build_root: image_stream_tag: name: fcos-buildroot @@ -22,9 +22,9 @@ images: coreos_coreos-assembler_latest: as: - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 to: build-test-qemu-img - dockerfile_literal: | # This stage actually builds the RHCOS OCI image. However, due to diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml index 30062ff7148f0..c7f7498a8aaa5 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml @@ -7,10 +7,10 @@ base_images: name: fedora namespace: coreos tag: "35" - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 + tag: rhel-8-golang-1.17-openshift-4.11 build_root: image_stream_tag: name: fcos-buildroot @@ -22,9 +22,9 @@ images: coreos_coreos-assembler_4.11: as: - registry.svc.ci.openshift.org/coreos/coreos-assembler:4.11 - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 to: build-test-qemu-img promotion: disabled: true diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml index 70583df44d4c4..64794900c76cd 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml @@ -7,10 +7,10 @@ base_images: name: fedora namespace: coreos tag: "35" - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 + tag: rhel-8-golang-1.17-openshift-4.11 build_root: image_stream_tag: name: fcos-buildroot @@ -22,9 +22,9 @@ images: coreos_coreos-assembler_latest: as: - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest - ocp_builder_rhel-8-golang-1.17-openshift-4.10: + ocp_builder_rhel-8-golang-1.17-openshift-4.11: as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 to: build-test-qemu-img promotion: excluded_images: From 2133b5f7a3f7139497439fa1467aa5f835063f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 8 Jun 2022 13:04:58 +0200 Subject: [PATCH 2/3] ci-operator/openshift/os: Use Fedora 36 for 4.11+ --- ci-operator/config/openshift/os/openshift-os-master.yaml | 2 +- ci-operator/config/openshift/os/openshift-os-release-4.11.yaml | 2 +- ci-operator/config/openshift/os/openshift-os-release-4.12.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index 203c04e84f3ba..e20d6843824f0 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -6,7 +6,7 @@ base_images: fedora: name: fedora namespace: coreos - tag: "35" + tag: "36" ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml index c7f7498a8aaa5..f501d6966e467 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.11.yaml @@ -6,7 +6,7 @@ base_images: fedora: name: fedora namespace: coreos - tag: "35" + tag: "36" ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml index 64794900c76cd..6ce106f922991 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml @@ -6,7 +6,7 @@ base_images: fedora: name: fedora namespace: coreos - tag: "35" + tag: "36" ocp_builder_rhel-8-golang-1.17-openshift-4.11: name: builder namespace: ocp From b2d43fb6a3f6284d3432261fc04ce19c26e7d4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 8 Jun 2022 13:06:16 +0200 Subject: [PATCH 3/3] ci-operator/openshift/os: master is now 4.12 --- ci-operator/config/openshift/os/openshift-os-master.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index e20d6843824f0..d7e20d0cc9fa6 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -120,17 +120,17 @@ promotion: disabled: true excluded_images: - '*' - name: "4.11" + name: "4.12" namespace: ocp releases: initial: integration: - name: "4.11" + name: "4.12" namespace: ocp latest: integration: include_built_images: true - name: "4.11" + name: "4.12" namespace: ocp resources: '*':