MDBF-790 - Rocky Linux 9 | last-N-Failed

MariaDB · Sep 6, 2024 · 91e9f54 · 91e9f54
1 parent af8bdf7
commit 91e9f54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/constants.py b/constants.py
@@ -29,12 +29,11 @@
     "amd64-debian-12",
     "amd64-debian-12-debug-embedded",
     "amd64-debian-12-deb-autobake",
-    "amd64-debian-12-last-N-failed",
     "amd64-debian-11-debug-ps-embedded",
     "amd64-debian-11-msan",
     "amd64-debian-11-msan-clang-16",
     "amd64-fedora-40",
-    "amd64-fedora-40-last-N-failed",
+    "amd64-rockylinux-9-last-N-failed",
     "amd64-ubuntu-2004-debug",
     "amd64-ubuntu-2204-debug-ps",
     "amd64-windows",
@@ -106,6 +105,7 @@
     "amd64-rhel-7",
     "amd64-rhel-8",
     "amd64-rhel-9",
+    "amd64-rockylinux-9-last-N-failed",
     "amd64-ubuntu-2004",
     "amd64-ubuntu-2004-debug",
     "amd64-ubuntu-2004-fulltest",
@@ -161,9 +161,7 @@
     "aarch64-ubuntu-2404",
     "amd64-debian-12",
     "amd64-debian-12-debug-embedded",
-    "amd64-debian-12-last-N-failed",
     "amd64-fedora-40",
-    "amd64-fedora-40-last-N-failed",
     "amd64-opensuse-15",
     "amd64-sles-15",
     "amd64-ubuntu-2404",

diff --git a/master-protected-branches/master.cfg b/master-protected-branches/master.cfg
@@ -203,14 +203,6 @@ for w_name in ["hz-bbw"]:
             jobs=jobs,
             save_packages=True,
         )
-        addWorker(
-            w_name,
-            i,
-            "-debian-12-last-N-failed",
-            os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian12",
-            jobs=jobs,
-            save_packages=True,
-        )
         addWorker(
             w_name,
             i,
@@ -230,8 +222,8 @@ for w_name in ["hz-bbw"]:
         addWorker(
             w_name,
             i,
-            "-fedora-40-last-N-failed",
-            os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "fedora40",
+            "-rockylinux-9-last-N-failed",
+            os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "rockylinux9",
             jobs=jobs,
             save_packages=True,
         )
@@ -555,20 +547,6 @@ c["builders"].append(
     )
 )
 
-c["builders"].append(
-    util.BuilderConfig(
-        name="amd64-debian-12-last-N-failed",
-        workernames=workers["x64-bbw-docker-debian-12-last-N-failed"],
-        tags=["Debian", "quick", "gcc", "protected"],
-        collapseRequests=True,
-        nextBuild=nextBuild,
-        canStartBuild=canStartBuild,
-        locks=getLocks,
-        properties={"mtr_additional_args": protected_branches_mtr_additional_args},
-        factory=getLastNFailedBuildsFactory("nm", mtrDbPool),
-    )
-)
-
 c["builders"].append(
     util.BuilderConfig(
         name="amd64-fedora-40",
@@ -585,8 +563,8 @@ c["builders"].append(
 
 c["builders"].append(
     util.BuilderConfig(
-        name="amd64-fedora-40-last-N-failed",
-        workernames=workers["x64-bbw-docker-fedora-40-last-N-failed"],
+        name="amd64-rockylinux-9-last-N-failed",
+        workernames=workers["x64-bbw-docker-rockylinux-9-last-N-failed"],
         tags=["Fedora", "quick", "gcc", "protected"],
         collapseRequests=True,
         nextBuild=nextBuild,