From a442b06ca0d100208a012506bb092ab8b3a79a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 10 Mar 2023 12:30:29 +0100
Subject: [PATCH 1/5] ci: Disable RHCOS 8 builds & tests

---
 ci/prow-entrypoint.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
index 354060a09..ec6d8e0a2 100755
--- a/ci/prow-entrypoint.sh
+++ b/ci/prow-entrypoint.sh
@@ -252,18 +252,6 @@ main () {
             cosa_build
             kola_test_qemu
             ;;
-        "rhcos-86-build-test-qemu")
-            setup_user
-            cosa_init "rhel-coreos-8"
-            cosa_build
-            kola_test_qemu
-            ;;
-        "rhcos-86-build-test-metal")
-            setup_user
-            cosa_init "rhel-coreos-8"
-            cosa_build
-            kola_test_metal
-            ;;
         "rhcos-92-build-test-qemu"|"rhcos-90-build-test-qemu")
             setup_user
             cosa_init "rhel-coreos-9"
@@ -288,6 +276,10 @@ main () {
             cosa_build
             kola_test_metal
             ;;
+        "rhcos-86-build-test-qemu"|"rhcos-86-build-test-metal")
+            # Disabled tests
+            exit 0
+            ;;
         *)
             # This case ensures that we exhaustively list the tests that should
             # pass for a PR. To add a new test in openshift/os:

From 100d0d46939a4d789a505f864bad3ca187707431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 10 Mar 2023 12:31:02 +0100
Subject: [PATCH 2/5] ci: Use RHCOS 9 for builds & tests by default

---
 ci/prow-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
index ec6d8e0a2..8bd56bef2 100755
--- a/ci/prow-entrypoint.sh
+++ b/ci/prow-entrypoint.sh
@@ -243,12 +243,12 @@ main () {
             prepare_repos
             ;;
         "build" | "init-and-build-default")  # TODO: change prow job to use init-and-build-default
-            cosa_init "rhel-coreos-8"
+            cosa_init "rhel-coreos-9"
             cosa_build
             ;;
         "rhcos-cosa-prow-pr-ci")
             setup_user
-            cosa_init "rhel-coreos-8"
+            cosa_init "rhel-coreos-9"
             cosa_build
             kola_test_qemu
             ;;

From 1c662d798e7091dfaaac307299630dab8466805e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 10 Mar 2023 12:34:32 +0100
Subject: [PATCH 3/5] ci: Update fetch path for 9.2 builds

---
 ci/prow-entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
index 8bd56bef2..86a9561c7 100755
--- a/ci/prow-entrypoint.sh
+++ b/ci/prow-entrypoint.sh
@@ -73,9 +73,9 @@ prepare_repos() {
     # Figure out which version we're building
     rhelver=$(rpm-ostree compose tree --print-only "${manifest}" | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.)
 
-    # Temporary workaround until we publish builds for other versions
-    if [[ "${rhelver}" == "86" ]]; then
-        prev_build_url="${REDIRECTOR_URL}/rhcos-${ocpver}/"
+    # Temporary workaround until we publish builds in the default path
+    if [[ "${rhelver}" == "92" ]]; then
+        prev_build_url="${REDIRECTOR_URL}/rhcos-${ocpver}-9.2/"
         # Fetch the previous build
         cosa buildfetch --url="${prev_build_url}"
     fi

From 227ca9e662ae4d8f4f3f6a33956dcdc1a1548bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 10 Mar 2023 12:34:48 +0100
Subject: [PATCH 4/5] ci: Cleanup unused versions and whitespace

---
 ci/prow-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
index 86a9561c7..e252f3f16 100755
--- a/ci/prow-entrypoint.sh
+++ b/ci/prow-entrypoint.sh
@@ -82,7 +82,7 @@ prepare_repos() {
 
     # Fetch the repos corresponding to the release we are building
     case "${rhelver}" in
-        86|90|92)
+        92)
             # 92 doesn't exist in release controller right now
             if [[ "${rhelver}" == "92" ]]; then rhelver=90; fi
             curl --fail -L "http://base-${ocpver_mut}-rhel${rhelver}.ocp.svc.cluster.local" -o "src/config/ocp.repo"
@@ -270,7 +270,7 @@ main () {
             cosa_build
             kola_test_qemu
             ;;
-        "scos-9-build-test-metal" )
+        "scos-9-build-test-metal")
             setup_user
             cosa_init "scos"
             cosa_build

From a5eb84adee64a5666a0c4430c279b0f95f133286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 10 Mar 2023 12:36:19 +0100
Subject: [PATCH 5/5] manifests: Use RHCOS 9 by default

---
 extensions.yaml | 2 +-
 image.yaml      | 2 +-
 manifest.yaml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions.yaml b/extensions.yaml
index 942638da8..91cb33f65 120000
--- a/extensions.yaml
+++ b/extensions.yaml
@@ -1 +1 @@
-extensions-rhel-coreos-8.yaml
\ No newline at end of file
+extensions-rhel-coreos-9.yaml
\ No newline at end of file
diff --git a/image.yaml b/image.yaml
index 7fb039b25..81b4da813 120000
--- a/image.yaml
+++ b/image.yaml
@@ -1 +1 @@
-image-rhel-coreos-8.yaml
\ No newline at end of file
+image-rhel-coreos-9.yaml
\ No newline at end of file
diff --git a/manifest.yaml b/manifest.yaml
index 72f0b18ae..5aa2be8d1 120000
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1 +1 @@
-manifest-rhel-coreos-8.yaml
\ No newline at end of file
+manifest-rhel-coreos-9.yaml
\ No newline at end of file