Merge branch 'dev'

common_factories.py

@@ -70,7 +70,7 @@ def run(self):
             )
 
             if tests:
-                test_args = " ".join(tests)
+                test_args = " ".join(set(tests))
                 self.setProperty("tests_to_run", test_args)
 
         return results.SUCCESS
@@ -463,7 +463,7 @@ def getRpmAutobakeFactory(mtrDbPool):
 baseurl=%(kw:url)s/%(prop:tarbuildnum)s/%(prop:buildername)s/rpms
 gpgcheck=0
 EOF
-            if [ "%(prop:rpm_type)s" = rhel8 ] || [ "%(prop:rpm_type)s" = centosstream8 ]; then
+            if [ "%(prop:rpm_type)s" = rhel8 ] || [ "%(prop:rpm_type)s" = centosstream8 ] || [ "%(prop:rpm_type)s" = alma8 ] || [ "%(prop:rpm_type)s" = rocky8 ]; then
                 echo "module_hotfixes = 1" >> MariaDB.repo
             fi
         """,

constants.py

@@ -134,6 +134,7 @@
     "amd64-fedora-39",
     "amd64-freebsd-14",
     "amd64-rhel-9",
+    "amd64-sles-15",
     "ppc64be-aix-71",
     "ppc64le-centos-stream9",
     "ppc64le-debian-11",

master-docker-nonstandard-2/master.cfg

@@ -144,6 +144,7 @@ addWorker(
     "quay.io/mariadb-foundation/bb-worker:debian12-386",
     jobs=20,
     save_packages=False,
+    shm_size="30G",
 )
 
 addWorker(
@@ -153,6 +154,7 @@ addWorker(
     "quay.io/mariadb-foundation/bb-worker:debian12-386",
     jobs=20,
     save_packages=False,
+    shm_size="30G",
 )
 
 addWorker(

master-nonlatent/master.cfg

@@ -1063,7 +1063,7 @@ c["builders"].append(
     util.BuilderConfig(
         name="aarch64-macos-compile-only",
         workernames=["bbw1-mac", "bbw2-mac"],
-        tags=["MacOS", "quick"],
+        tags=["MacOS", "quick", "protected"],
         collapseRequests=True,
         nextBuild=nextBuild,
         factory=get_macos_factory(compile_only=True),

scripts/bash_lib.sh

@@ -303,7 +303,8 @@ rpm_setup_mariadb_mirror() {
 [mariadb]
 name=MariaDB
 baseurl=$baseurl
-# //TEMP following is probably not needed for all OS
+# //TEMP following is not needed for all OS
+# - rhel8 based OS (almalinux 8, rockylinux 8, centos 8)
 module_hotfixes = 1
 gpgkey=https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB
 gpgcheck=1

utils.py

@@ -461,15 +461,11 @@ def hasEco(props):
 def hasCompat(step):
     builderName = str(step.getProperty("buildername"))
 
-    # For s390x there are no compat files
-    if "s390x" in builderName:
+    # For s390x and the listed distros there are no compat files
+    if any(builderName.find(sub) != -1 for sub in {"s390x", "fedora", "alma", "rocky"}):
         return False
     if "rhel" in builderName or "centos" in builderName:
         return step.getProperty("rpm_type")[-1] in ["7", "8"]
-    if "fedora" in builderName:
-        return step.getProperty("rpm_type")[-1] in ["35", "36"]
-    if "alma" in builderName or "rocky" in builderName:
-        return False
     return True