From 210a6b9beee9b3d42b6d0085c8c19351a3631a8f Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Wed, 29 Mar 2023 14:59:26 +0200 Subject: [PATCH 1/4] USHIFT-953: Use rhel9 base images for CI --- .../config/openshift/microshift/openshift-microshift-main.yaml | 2 +- .../openshift/microshift/openshift-microshift-release-4.13.yaml | 2 +- .../openshift/microshift/openshift-microshift-release-4.14.yaml | 2 +- .../openshift/microshift/openshift-microshift-release-4.15.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 6a53364159384..01d066f5d8cf0 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 images: - dockerfile_literal: | FROM src diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml index f14484b3550ca..3c8fcb533b536 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 images: - dockerfile_literal: | FROM src diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml index 3fc8faeb389a0..037d791fae0be 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 images: - dockerfile_literal: | FROM src diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml index 826533e77084a..68b4053383a8f 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 images: - dockerfile_literal: | FROM src From 1f0e652dcd3d20e3f594b63b96dc4f670595b99f Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Wed, 3 May 2023 16:20:30 +0200 Subject: [PATCH 2/4] USHIFT-953: Use rhel9 base images in openshift-priv --- .../microshift/openshift-priv-microshift-main.yaml | 2 +- .../microshift/openshift-priv-microshift-release-4.13.yaml | 2 +- .../microshift/openshift-priv-microshift-release-4.14.yaml | 2 +- .../microshift/openshift-priv-microshift-release-4.15.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml index d364bf17c0e48..24d5d684f9570 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.13.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.13.yaml index 5cf49b3c1e1a7..68a85341c8e67 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.13.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml index cb5dfb0594c0e..7e480dd3ad88f 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml index c2b55bf4a874b..3a844c630e9fb 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.13 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | From a14f38b42ca9c683e7cbff9443eda8045fdbd435 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Tue, 9 May 2023 11:03:51 +0200 Subject: [PATCH 3/4] USHIFT-953: Use 4.14 build root images --- .../config/openshift/microshift/openshift-microshift-main.yaml | 2 +- .../openshift/microshift/openshift-microshift-release-4.14.yaml | 2 +- .../openshift/microshift/openshift-microshift-release-4.15.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 01d066f5d8cf0..a98b67287b213 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 images: - dockerfile_literal: | FROM src diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml index 037d791fae0be..1029a0d6e2afa 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 images: - dockerfile_literal: | FROM src diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml index 68b4053383a8f..8d5b3b7ab2ffd 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 images: - dockerfile_literal: | FROM src From b9a60646e28893257fad16d2eb9c017a71a99634 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Tue, 9 May 2023 11:13:53 +0200 Subject: [PATCH 4/4] USHIFT-953: Use 4.14 build root images in priv --- .../microshift/openshift-priv-microshift-main.yaml | 2 +- .../microshift/openshift-priv-microshift-release-4.14.yaml | 2 +- .../microshift/openshift-priv-microshift-release-4.15.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml index 24d5d684f9570..8bde731296fd1 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-main.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml index 7e480dd3ad88f..8ff301cae1a63 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.14.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: | diff --git a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml index 3a844c630e9fb..54cbedf80ec31 100644 --- a/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/microshift/openshift-priv-microshift-release-4.15.yaml @@ -15,7 +15,7 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.19-openshift-4.13 + tag: rhel-9-release-golang-1.19-openshift-4.14 canonical_go_repository: github.com/openshift/microshift images: - dockerfile_literal: |