From 7e72d7dfef2630f366493fbdd46ad78f498d3422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Wed, 4 Jan 2023 14:58:00 +0100
Subject: [PATCH 1/2] container/hub: increase the httpd's timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CGImport seems to be slow in certain cases. Let's increase the timeout,
otherwise CGImport for the 10 GiB RAW AMI might exceed it.

Fun fact: Fedora's Koji has the timeout configured to 10800 seconds. 🤯
---
 test/container/hub/kojiweb.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/container/hub/kojiweb.conf b/test/container/hub/kojiweb.conf
index a71a738..4d3cbd7 100644
--- a/test/container/hub/kojiweb.conf
+++ b/test/container/hub/kojiweb.conf
@@ -7,6 +7,9 @@ Alias /koji "/usr/share/koji-web/scripts/wsgi_publisher.py"
 WSGIDaemonProcess koji lang=C.UTF-8
 WSGIProcessGroup koji
 
+# CGImport tends to be slow, let's give the request more time than the default 60 seconds
+TimeOut 300
+
 <Directory "/usr/share/koji-web/scripts/">
     Options ExecCGI
     SetHandler wsgi-script

From 019b61e4decc0849cb5439d1053033c90f84cf82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Fri, 25 Nov 2022 09:58:09 +0100
Subject: [PATCH 2/2] ci: add Fedora 37

This commit needs to do three things:
- update the terraform definition
- add fedora-37 to the gitlab-ci file
- bump osbuild and osbuild-composer versions, so we have F37 RPMs for them

I also removed the commented out aarch64 runners to clean the file a bit.
---
 .gitlab-ci.yml      | 8 ++++----
 schutzbot/deploy.sh | 4 ++--
 schutzbot/terraform | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8159921..fc42f1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,8 @@ RPM:
       - RUNNER:
           - aws/fedora-36-x86_64
           - aws/fedora-36-aarch64
+          - aws/fedora-37-x86_64
+          - aws/fedora-37-aarch64
           - aws/rhel-8.6-ga-x86_64
           - aws/rhel-8.6-ga-aarch64
 
@@ -42,14 +44,12 @@ Testing:
     - schutzbot/update_github_status.sh update
   parallel:
     matrix:
+      # https://quay.io/repository/osbuild/postgres available only for x86_64
       - RUNNER:
-          # https://quay.io/repository/osbuild/postgres available only for x86_64
-          # - aws/fedora-33-aarch64
           - aws/fedora-36-x86_64
-          # - aws/fedora-34-aarch64
+          - aws/fedora-37-x86_64
       - RUNNER:
           - aws/rhel-8.6-ga-x86_64
-          # - aws/rhel-8.4-ga-aarch64
         INTERNAL_NETWORK: ["true"]
 
 finish:
diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index 1ed6861..2bc65ad 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=376cbffd136bc4ba86fc7c63697fa5b88fe3acef             # release 62
-OSBUILD_COMPOSER_COMMIT=2d13050ba84a2bb30d9dd980639ee78354fe90f3    # release 59-dev (includes mock openid server fix)
+OSBUILD_COMMIT=18c69d2620c785227cdc502677c55d896529d5ee             # release 74
+OSBUILD_COMPOSER_COMMIT=13fdf04839ff25f4cd61c80a0d046824df0519c5    # release 71
 
 # Get OS details.
 source /etc/os-release
diff --git a/schutzbot/terraform b/schutzbot/terraform
index 81d870a..57bc904 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-0896913e87404485295bd2d19261fa1a4379971e
+04c82e2156dfee54181e10eac317957a8426f091