From 1668c78cfb63c927b1b2073fc06f1b3351d3418b Mon Sep 17 00:00:00 2001
From: Tom Koscielniak <tkosciel@redhat.com>
Date: Fri, 14 Mar 2025 14:28:06 +0100
Subject: [PATCH] tests/CI: Add rhel 9.7 and 10.1 nightly runners

---
 .gitlab-ci.yml      |  8 +++++
 Schutzfile          | 82 +++++++++++++++++++++++++++++++++++++++++++++
 schutzbot/terraform |  2 +-
 3 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af4600dc..5a01cf18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,12 @@ RPM:
       - RUNNER:
           - aws/rhel-9.6-nightly-x86_64
           - aws/rhel-9.6-nightly-aarch64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-9.7-nightly-aarch64
           - aws/rhel-10.0-nightly-x86_64
           - aws/rhel-10.0-nightly-aarch64
+          - aws/rhel-10.1-nightly-x86_64
+          - aws/rhel-10.1-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 OSTree Images:
@@ -144,8 +148,12 @@ Manifests:
           - aws/rhel-9.4-ga-aarch64
           - aws/rhel-9.6-nightly-x86_64
           - aws/rhel-9.6-nightly-aarch64
+          - aws/rhel-9.7-nightly-x86_64
+          - aws/rhel-9.7-nightly-aarch64
           - aws/rhel-10.0-nightly-x86_64
           - aws/rhel-10.0-nightly-aarch64
+          - aws/rhel-10.1-nightly-x86_64
+          - aws/rhel-10.1-nightly-aarch64
         INTERNAL_NETWORK: "true"
         # Test only the following manifest generation configs
         CONFIG: "empty all-customizations"
diff --git a/Schutzfile b/Schutzfile
index 5909d19c..1c2ab402 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -263,6 +263,47 @@
       }
     ]
   },
+  "rhel-9.7": {
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/rhel9internal.repo",
+        "x86_64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.7-20250304"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.7-20250304"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.7-20250304"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.7-20250304"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.7-20250304"
+          },
+          {
+            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.7-20250304"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-10.0": {
     "repos": [
       {
@@ -303,5 +344,46 @@
         ]
       }
     ]
+  },
+  "rhel-10.1": {
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/rhel10internal.repo",
+        "x86_64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.1-20250304"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.1-20250304"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.1-20250304"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.1-20250304"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.1-20250304"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.1-20250304"
+          }
+        ]
+      }
+    ]
   }
 }
diff --git a/schutzbot/terraform b/schutzbot/terraform
index fb2f0e3b..6e14fe0c 100644
--- a/schutzbot/terraform
+++ b/schutzbot/terraform
@@ -1 +1 @@
-2c51ba92065231c4986894cc2bc214dea1b2c157
\ No newline at end of file
+932f22fff75014dc079b3291157028923d2926d0