From f900ff93689707b7d49c68e03a780f7f444b3a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= 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 +- 3 files changed, 6 insertions(+), 6 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..e405ee3 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=0edbe0cf966b13f9c16c43c1d37c200d63b79a88 # release 99 +OSBUILD_COMPOSER_COMMIT=d71574976ee2d954f8e04bd3bae9164e46a08a7b # release 93 # Get OS details. source /etc/os-release diff --git a/schutzbot/terraform b/schutzbot/terraform index 57bc904..3ca9c45 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -04c82e2156dfee54181e10eac317957a8426f091 +5382b3bd9127dbb75994896fc5959a640054ba83