From e4d912f3481cf29dcbed9670dab663ff7b94a4d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Fri, 9 Jul 2021 11:36:09 +0200
Subject: [PATCH] terraform: update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- run only koji.sh for rhel-90 target, Fixes #1461

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 .gitlab-ci.yml      | 50 ++++++++++++++++++++++-----------------------
 schutzbot/terraform |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c45dfded..95a39ec66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,13 +54,13 @@ RPM:
           - aws/fedora-33-aarch64
           - aws/fedora-34-x86_64
           - aws/fedora-34-aarch64
-          - aws/rhel-8-x86_64
-          - aws/rhel-8-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8.5-x86_64
-          - aws/rhel-8.5-aarch64
+          - aws/rhel-8.5-nightly-x86_64
+          - aws/rhel-8.5-nightly-aarch64
           - aws/rhel-9.0-beta-nightly-x86_64
           - aws/rhel-9.0-beta-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -95,7 +95,7 @@ Prepare-rhel-internal:
       - RUNNER:
           # NOTE: 1 runner prepares for all arches b/c subsequent jobs download
           # artifacts from all previous jobs and the last one wins
-          - aws/rhel-8.5-x86_64
+          - aws/rhel-8.5-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
 Base:
@@ -115,13 +115,13 @@ Base:
           # See COMPOSER-919
           # - aws/fedora-34-x86_64
           # - aws/fedora-34-aarch64
-          - aws/rhel-8-x86_64
-          - aws/rhel-8-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8.5-x86_64
-          - aws/rhel-8.5-aarch64
+          - aws/rhel-8.5-nightly-x86_64
+          - aws/rhel-8.5-nightly-aarch64
           - aws/rhel-9.0-beta-nightly-x86_64
           - aws/rhel-9.0-beta-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -149,10 +149,10 @@ Regression:
           - aws/centos-stream-8-x86_64
           - aws/centos-stream-8-aarch64
       - RUNNER:
-          - aws/rhel-8-x86_64
-          - aws/rhel-8-aarch64
-          - aws/rhel-8.5-x86_64
-          - aws/rhel-8.5-aarch64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.5-nightly-x86_64
+          - aws/rhel-8.5-nightly-aarch64
           - aws/rhel-9.0-beta-nightly-x86_64
           - aws/rhel-9.0-beta-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -177,8 +177,8 @@ OSTree:
           - openstack/fedora-33-x86_64
           # See COMPOSER-919
           # - openstack/fedora-34-x86_64
-          - openstack/rhel-8-x86_64
-          - openstack/rhel-8.5-x86_64
+          - openstack/rhel-8.4-ga-x86_64
+          - openstack/rhel-8.5-devel-x86_64
           - openstack/rhel-9.0-beta-nightly-x86_64
 
 New OSTree:
@@ -223,7 +223,7 @@ OSTree raw image:
   parallel:
     matrix:
       - RUNNER:
-          - openstack/rhel-8.5-x86_64
+          - openstack/rhel-8.5-devel-x86_64
 
 .INTEGRATION_TESTS: &INTEGRATION_TESTS
   SCRIPT:
@@ -259,13 +259,13 @@ Integration:
           - aws/centos-stream-8-x86_64
       - <<: *INTEGRATION_TESTS
         RUNNER:
-          - aws/rhel-8-x86_64
-          - aws/rhel-8.5-x86_64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.5-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - SCRIPT:
           - azure_hyperv_gen2.sh
         RUNNER:
-          - aws/rhel-8.5-x86_64
+          - aws/rhel-8.5-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
       - SCRIPT:
           - aws.sh
@@ -308,8 +308,8 @@ API:
           - aws/centos-stream-8-x86_64
       - <<: *API_TESTS
         RUNNER:
-          - aws/rhel-8-x86_64
-          - aws/rhel-8.5-x86_64
+          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.5-nightly-x86_64
           - aws/rhel-9.0-beta-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -328,8 +328,8 @@ libvirt:
           - openstack/fedora-33-x86_64
           - openstack/centos-stream-8-x86_64
       - RUNNER:
-          - openstack/rhel-8-x86_64
-          - openstack/rhel-8.5-x86_64
+          - openstack/rhel-8.4-ga-x86_64
+          - openstack/rhel-8.5-devel-x86_64
           - openstack/rhel-9.0-beta-nightly-x86_64
         INTERNAL_NETWORK: ["true"]
 
@@ -342,7 +342,7 @@ RHEL 9 on 8:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/koji.sh
   variables:
-    RUNNER: aws/rhel-8-x86_64
+    RUNNER: aws/rhel-8.4-ga-x86_64
     INTERNAL_NETWORK: "true"
     DISTRO_CODE: rhel-90
 
@@ -377,7 +377,7 @@ Installer:
   parallel:
     matrix:
       - RUNNER:
-          - openstack/rhel-8.5-x86_64
+          - openstack/rhel-8.5-devel-x86_64
           - openstack/rhel-9.0-beta-nightly-x86_64
 
 SCHEDULED_CLOUD_CLEANER:
diff --git a/schutzbot/terraform b/schutzbot/terraform
index c10edb40a..bff508dc2 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-e574b855f5a26d2b3bf1e75760a3bb653425c447
+cf3b799d20d18084a7337e12d2e48d48b716b305