From 50ac27036045420ef47a70d03c0d7a3c64638f14 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Mon, 31 Jan 2022 17:03:54 +0100
Subject: [PATCH] ci: request CentOS Stream 8 bare-metal machines

CentOS 8 is EOL since the beginning of the year. CentOS Stream 8
installations should be used instead.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 ci-job-validation.groovy        | 2 +-
 commitlint.groovy               | 2 +-
 containerized-tests.groovy      | 2 +-
 k8s-e2e-external-storage.groovy | 2 +-
 mini-e2e-helm.groovy            | 2 +-
 mini-e2e.groovy                 | 2 +-
 upgrade-tests.groovy            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci-job-validation.groovy b/ci-job-validation.groovy
index 890701251..b657b0de2 100644
--- a/ci-job-validation.groovy
+++ b/ci-job-validation.groovy
@@ -71,7 +71,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/commitlint.groovy b/commitlint.groovy
index 23061c047..02210cf70 100644
--- a/commitlint.groovy
+++ b/commitlint.groovy
@@ -20,7 +20,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/containerized-tests.groovy b/containerized-tests.groovy
index dbeb02db2..7376dbe2a 100644
--- a/containerized-tests.groovy
+++ b/containerized-tests.groovy
@@ -71,7 +71,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/k8s-e2e-external-storage.groovy b/k8s-e2e-external-storage.groovy
index 813b4664d..a4885a881 100644
--- a/k8s-e2e-external-storage.groovy
+++ b/k8s-e2e-external-storage.groovy
@@ -96,7 +96,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/mini-e2e-helm.groovy b/mini-e2e-helm.groovy
index 820db25fd..106fd8e40 100644
--- a/mini-e2e-helm.groovy
+++ b/mini-e2e-helm.groovy
@@ -98,7 +98,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/mini-e2e.groovy b/mini-e2e.groovy
index 4193eb9ef..0b54cb963 100644
--- a/mini-e2e.groovy
+++ b/mini-e2e.groovy
@@ -95,7 +95,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"
diff --git a/upgrade-tests.groovy b/upgrade-tests.groovy
index b04408e48..f3a5b82f0 100644
--- a/upgrade-tests.groovy
+++ b/upgrade-tests.groovy
@@ -95,7 +95,7 @@ node('cico-workspace') {
 			}
 			firstAttempt = false
 			cico = sh(
-				script: "cico node get -f value -c hostname -c comment --release=8 --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
+				script: "cico node get -f value -c hostname -c comment --release=8-stream --retry-count=${cico_retries} --retry-interval=${cico_retry_interval}",
 				returnStdout: true
 			).trim().tokenize(' ')
 			env.CICO_NODE = "${cico[0]}.ci.centos.org"