From 340470bb2ddad2d0f9711f422bb212f21c9f5070 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Thu, 16 Oct 2025 15:44:04 +0200
Subject: [PATCH 1/3] schutzbot: update terraform ID for new runners

---
 schutzbot/terraform | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schutzbot/terraform b/schutzbot/terraform
index f35674de8f..bfa7c1b1fa 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-2c51ba92065231c4986894cc2bc214dea1b2c157
+176ef5f47d09eb9aeec016c6185a6bb2558a8ba4

From becf318d477ab367aa327a6bc48cd30021c3db98 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Thu, 16 Oct 2025 11:41:38 +0200
Subject: [PATCH 2/3] Schutzfile: switch CI runner to Fedora 42

Fedora 41 is EOL next month.  Let's start using Fedora 42 runners in
GitLab CI to run our test builds.
---
 .gitlab-ci.yml | 232 ++++++++++++++++++++++++-------------------------
 Schutzfile     |  47 +++++-----
 2 files changed, 136 insertions(+), 143 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 581090dd16..e4334a72e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -78,7 +78,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -97,7 +97,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -116,7 +116,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -135,7 +135,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -154,7 +154,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -173,7 +173,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -192,7 +192,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -211,7 +211,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -230,7 +230,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -249,7 +249,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -268,7 +268,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -287,7 +287,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -306,7 +306,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -325,7 +325,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -344,7 +344,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -363,7 +363,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -382,7 +382,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -401,7 +401,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -420,7 +420,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -439,7 +439,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -458,7 +458,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -477,7 +477,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -496,7 +496,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -515,7 +515,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -534,7 +534,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -553,7 +553,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -572,7 +572,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -591,7 +591,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -610,7 +610,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -629,7 +629,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -648,7 +648,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -667,7 +667,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -686,7 +686,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -705,7 +705,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -724,7 +724,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -743,7 +743,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -762,7 +762,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -781,7 +781,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1227,7 +1227,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1249,7 +1249,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1271,7 +1271,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1293,7 +1293,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1315,7 +1315,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1337,7 +1337,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1359,7 +1359,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1381,7 +1381,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1403,7 +1403,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1425,7 +1425,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1447,7 +1447,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1469,7 +1469,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1491,7 +1491,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1513,7 +1513,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1535,7 +1535,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1557,7 +1557,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1579,7 +1579,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1601,7 +1601,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1623,7 +1623,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1645,7 +1645,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1667,7 +1667,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1689,7 +1689,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1711,7 +1711,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1733,7 +1733,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1755,7 +1755,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1777,7 +1777,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1799,7 +1799,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1821,7 +1821,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1843,7 +1843,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1865,7 +1865,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1887,7 +1887,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1909,7 +1909,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1931,7 +1931,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1953,7 +1953,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1975,7 +1975,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -1997,7 +1997,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2019,7 +2019,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2041,7 +2041,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-aarch64
+    RUNNER: aws/fedora-42-aarch64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2063,7 +2063,7 @@ fail:
   stage: ostree-gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2512,7 +2512,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2532,7 +2532,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2552,7 +2552,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2572,7 +2572,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2592,7 +2592,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2612,7 +2612,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2632,7 +2632,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2652,7 +2652,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2672,7 +2672,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2692,7 +2692,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2712,7 +2712,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2732,7 +2732,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2752,7 +2752,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2772,7 +2772,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2792,7 +2792,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2812,7 +2812,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2832,7 +2832,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2852,7 +2852,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2872,7 +2872,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2892,7 +2892,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2912,7 +2912,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2932,7 +2932,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2952,7 +2952,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2972,7 +2972,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -2992,7 +2992,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3012,7 +3012,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3032,7 +3032,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3052,7 +3052,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3072,7 +3072,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3092,7 +3092,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3112,7 +3112,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3132,7 +3132,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3152,7 +3152,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3172,7 +3172,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3192,7 +3192,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3212,7 +3212,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3232,7 +3232,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
@@ -3252,7 +3252,7 @@ fail:
   stage: gen
   extends: .terraform
   variables:
-    RUNNER: aws/fedora-41-x86_64
+    RUNNER: aws/fedora-42-x86_64
     INTERNAL_NETWORK: "true"
   script:
     - sudo ./test/scripts/setup-osbuild-repo
diff --git a/Schutzfile b/Schutzfile
index 82761e756a..64b362de67 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -4,7 +4,7 @@
     "bootc-image-builder": {
       "ref": "quay.io/centos-bootc/bootc-image-builder@sha256:9893e7209e5f449b86ababfd2ee02a58cca2e5990f77b06c3539227531fc8120"
     },
-    "gitlab-ci-runner": "aws/fedora-41"
+    "gitlab-ci-runner": "aws/fedora-42"
   },
   "centos-9": {
     "dependencies": {
@@ -25,6 +25,13 @@
       "osbuild": {
         "commit": "f29f4f2ea0b37d3cfbaa4371452458fdffb0c4f9"
       }
+    }
+  },
+  "fedora-42": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "565b4163311391707de75b4d1aeb75e229820f33"
+      }
     },
     "repos": [
       {
@@ -33,43 +40,29 @@
           {
             "title": "fedora",
             "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-fedora-20241107"
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-fedora-20250512"
+          },
+          {
+            "title": "fedora-updates",
+            "name": "fedora-updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-x86_64-updates-released-20251001"
           }
         ],
         "aarch64": [
           {
             "title": "fedora",
             "name": "fedora",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-fedora-20241107"
-          }
-        ]
-      },
-      {
-        "file": "/etc/yum.repos.d/fedora-updates.repo",
-        "x86_64": [
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-fedora-20250512"
+          },
           {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-x86_64-updates-released-20251001"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "updates",
-            "name": "updates",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f41/f41-aarch64-updates-released-20251001"
+            "title": "fedora-updates",
+            "name": "fedora-updates",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f42/f42-aarch64-updates-released-20251001"
           }
         ]
       }
     ]
   },
-  "fedora-42": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "f29f4f2ea0b37d3cfbaa4371452458fdffb0c4f9"
-      }
-    }
-  },
   "fedora-43": {
     "dependencies": {
       "osbuild": {
@@ -84,4 +77,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From 317dca0d2190889f65b12968f51062c2b483f7ac Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Thu, 16 Oct 2025 16:07:59 +0200
Subject: [PATCH 3/3] Schutzfile: update osbuild commit ID for Fedora 42

Bump the osbuild commit to the latest version for Fedora 42.
---
 Schutzfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Schutzfile b/Schutzfile
index 64b362de67..8e46d85b92 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -30,7 +30,7 @@
   "fedora-42": {
     "dependencies": {
       "osbuild": {
-        "commit": "565b4163311391707de75b4d1aeb75e229820f33"
+        "commit": "285a0243ec5596e0adecfafbdf21b7d335bfd19d"
       }
     },
     "repos": [