From 197b77f6900843192d7690304ccc4be19f820689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= <ppolawsk@redhat.com>
Date: Mon, 6 Nov 2023 23:18:25 +0100
Subject: [PATCH] CI: Update workers fleet

By default CI is running on RHEL 8, F36 and F37 workers.
This commit adds Fedora 38 to the workers list
and removes deprecated Fedora 36
---
 .gitlab-ci.yml      |  6 +++---
 schutzbot/deploy.sh |  4 ++--
 schutzbot/terraform |  2 +-
 test/integration.sh | 30 ++++++++++++++++++------------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc42f1b..dfcfccb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,10 @@ RPM:
   parallel:
     matrix:
       - RUNNER:
-          - aws/fedora-36-x86_64
-          - aws/fedora-36-aarch64
           - aws/fedora-37-x86_64
           - aws/fedora-37-aarch64
+          - aws/fedora-38-x86_64
+          - aws/fedora-38-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
 
@@ -46,8 +46,8 @@ Testing:
     matrix:
       # https://quay.io/repository/osbuild/postgres available only for x86_64
       - RUNNER:
-          - aws/fedora-36-x86_64
           - aws/fedora-37-x86_64
+          - aws/fedora-38-x86_64
       - RUNNER:
           - aws/rhel-8.6-ga-x86_64
         INTERNAL_NETWORK: ["true"]
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 2bc65ad..15988bc 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -20,8 +20,8 @@ function retry {
 
 # Variables for where to find osbuild-composer RPMs to test against
 DNF_REPO_BASEURL=http://osbuild-composer-repos.s3-website.us-east-2.amazonaws.com
-OSBUILD_COMMIT=18c69d2620c785227cdc502677c55d896529d5ee             # release 74
-OSBUILD_COMPOSER_COMMIT=13fdf04839ff25f4cd61c80a0d046824df0519c5    # release 71
+OSBUILD_COMMIT=8c95bd9dd7820a908b756a171d54104122ee906c             # release 103
+OSBUILD_COMPOSER_COMMIT=cfc63297ebb6eb6345062bafad0fe1e1db9a8add    # release 97
 
 # Get OS details.
 source /etc/os-release
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 57bc904..e88c9f0 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-04c82e2156dfee54181e10eac317957a8426f091
+0caf5afd068c94b7c39419bb1a2249d1e1dae6b2
diff --git a/test/integration.sh b/test/integration.sh
index afde1a9..8eee23f 100755
--- a/test/integration.sh
+++ b/test/integration.sh
@@ -5,6 +5,22 @@ function greenprint {
     echo -e "\033[1;32m${1}\033[0m"
 }
 
+function cleanup {
+    greenprint "Stopping koji builder"
+    sudo /usr/libexec/koji-osbuild-tests/run-builder.sh stop /usr/share/koji-osbuild-tests
+
+    greenprint "Stopping containers"
+    sudo /usr/libexec/koji-osbuild-tests/run-koji-container.sh stop
+
+    greenprint "Stopping mock OpenID server"
+    sudo /usr/libexec/koji-osbuild-tests/run-openid.sh stop
+
+    greenprint "Removing generated CA cert"
+    sudo rm /etc/pki/ca-trust/source/anchors/osbuild-ca-crt.pem
+    sudo update-ca-trust
+}
+trap cleanup EXIT
+
 # Get OS data.
 source /etc/os-release
 
@@ -68,15 +84,5 @@ AWS_ACCESS_KEY_ID="${V2_AWS_ACCESS_KEY_ID:-}" \
 AWS_SECRET_ACCESS_KEY="${V2_AWS_SECRET_ACCESS_KEY:-}" \
 python3 -m unittest discover -v /usr/libexec/koji-osbuild-tests/integration/
 
-greenprint "Stopping koji builder"
-sudo /usr/libexec/koji-osbuild-tests/run-builder.sh stop /usr/share/koji-osbuild-tests
-
-greenprint "Stopping containers"
-sudo /usr/libexec/koji-osbuild-tests/run-koji-container.sh stop
-
-greenprint "Stopping mock OpenID server"
-sudo /usr/libexec/koji-osbuild-tests/run-openid.sh stop
-
-greenprint "Removing generated CA cert"
-sudo rm /etc/pki/ca-trust/source/anchors/osbuild-ca-crt.pem
-sudo update-ca-trust
+# cleanup() will be triggered by EXIT
+#