Remove obsolete runner from CI

osbuild · Nov 6, 2023 · 7a2cb22 · 7a2cb22
1 parent bde2913
commit 7a2cb22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 113 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -65,16 +65,12 @@ Regression:
           - aws/centos-stream-9-aarch64
       - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"]
         RUNNER:
-          - aws/rhel-8.7-ga-x86_64
-          - aws/rhel-8.7-ga-aarch64
-          - aws/rhel-8.9-nightly-x86_64
-          - aws/rhel-8.9-nightly-aarch64
+          - aws/rhel-8.8-ga-x86_64
+          - aws/rhel-8.8-ga-aarch64
           - aws/rhel-8.10-nightly-x86_64
           - aws/rhel-8.10-nightly-aarch64
-          - aws/rhel-9.1-ga-x86_64
-          - aws/rhel-9.1-ga-aarch64
-          - aws/rhel-9.3-nightly-x86_64
-          - aws/rhel-9.3-nightly-aarch64
+          - aws/rhel-9.2-ga-x86_64
+          - aws/rhel-9.2-ga-aarch64
           - aws/rhel-9.4-nightly-x86_64
           - aws/rhel-9.4-nightly-aarch64
         INTERNAL_NETWORK: "true"
@@ -116,8 +112,6 @@ Image-info-build:
     matrix:
       - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"]
         RUNNER:
-          - aws/fedora-36-x86_64
-          - aws/fedora-36-aarch64
           - aws/fedora-37-x86_64
           - aws/fedora-37-aarch64
           - aws/centos-stream-8-x86_64
@@ -126,24 +120,12 @@ Image-info-build:
           - aws/centos-stream-9-aarch64
       - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"]
         RUNNER:
-          - aws/rhel-8.6-ga-x86_64
-          - aws/rhel-8.6-ga-aarch64
-          - aws/rhel-8.7-ga-x86_64
-          - aws/rhel-8.7-ga-aarch64
-          - aws/rhel-8.8-nightly-x86_64
-          - aws/rhel-8.8-nightly-aarch64
-          - aws/rhel-8.9-nightly-x86_64
-          - aws/rhel-8.9-nightly-aarch64
+          - aws/rhel-8.8-ga-x86_64
+          - aws/rhel-8.8-ga-aarch64
           - aws/rhel-8.10-nightly-x86_64
           - aws/rhel-8.10-nightly-aarch64
-          - aws/rhel-9.0-ga-x86_64
-          - aws/rhel-9.0-ga-aarch64
-          - aws/rhel-9.1-ga-x86_64
-          - aws/rhel-9.1-ga-aarch64
-          - aws/rhel-9.2-nightly-x86_64
-          - aws/rhel-9.2-nightly-aarch64
-          - aws/rhel-9.3-nightly-x86_64
-          - aws/rhel-9.3-nightly-aarch64
+          - aws/rhel-9.2-ga-x86_64
+          - aws/rhel-9.2-ga-aarch64
           - aws/rhel-9.4-nightly-x86_64
           - aws/rhel-9.4-nightly-aarch64
         INTERNAL_NETWORK: "true"

diff --git a/Schutzfile b/Schutzfile
@@ -427,52 +427,6 @@
       }
     ]
   },
-  "rhel-8.9": {
-    "dependencies": {
-      "osbuild": {
-        "commit": "04eab998b719bdaadae11d2a87ef9bf2d538cbfb"
-      }
-    },
-    "repos": [
-      {
-        "file": "/etc/yum.repos.d/rhel8internal.repo",
-        "x86_64": [
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20231015"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20231015"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20231015"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20231015"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20231015"
-          },
-          {
-            "title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20231015"
-          }
-        ]
-      }
-    ]
-  },
   "rhel-8.10": {
     "repos": [
       {
@@ -596,47 +550,6 @@
       }
     ]
   },
-  "rhel-9.2": {
-    "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.2-20221115"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.2-20221115"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.2-20221115"
-          }
-        ],
-        "aarch64": [
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
-            "name": "baseos",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.2-20221115"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
-            "name": "appstream",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.2-20221115"
-          },
-          {
-            "title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
-            "name": "crb",
-            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.2-20221115"
-          }
-        ]
-      }
-    ]
-  },
   "rhel-9.3": {
     "dependencies": {
       "osbuild": {