From cc59c667e2937ea1a32ec116240cdf5d2d4f4c93 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Mon, 31 Jan 2022 06:56:09 +0000
Subject: [PATCH] ci: switch from rhel 8.4 to 8.5

Composer stopped building RPMs for 8.4, so we cannot pin commits
for new versions anymore. Switch to 8.5.
Update terraform commit accordingly.
---
 .gitlab-ci.yml      | 6 +++---
 schutzbot/terraform | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd50f14..d5d79f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,8 @@ RPM:
       - RUNNER:
           - aws/fedora-34-x86_64
           - aws/fedora-34-aarch64
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.5-ga-x86_64
+          - aws/rhel-8.5-ga-aarch64
 
 Testing:
   stage: test
@@ -48,7 +48,7 @@ Testing:
           - aws/fedora-34-x86_64
           # - aws/fedora-34-aarch64
       - RUNNER:
-          - aws/rhel-8.4-ga-x86_64
+          - aws/rhel-8.5-ga-x86_64
           # - aws/rhel-8.4-ga-aarch64
         INTERNAL_NETWORK: ["true"]
 
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 6f6e110..04c2b61 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-40c40e64dc5df8d2e4d12b587833d5ff725940d2
+fdfd0f7f4cf26907e15d35757f8f61f318db626c