Merge branch 'dev'

fauust · Mar 15, 2024 · 637e3f6 · 637e3f6
2 parents 8e0bdf0 + d638fb6
commit 637e3f6
Show file tree

Hide file tree

Showing 22 changed files with 657 additions and 63 deletions.
diff --git a/.github/workflows/bbm_deploy.yml b/.github/workflows/bbm_deploy.yml
@@ -14,6 +14,7 @@ on:
       - "master-**"
       - "master.cfg"
       - "os_info.yaml"
+      - "script_templates/**"
       - "utils.py"
       - "validate_master_cfg.sh"
   pull_request:
@@ -28,6 +29,7 @@ on:
       - "master-**"
       - "master.cfg"
       - "os_info.yaml"
+      - "script_templates/**"
       - "utils.py"
       - "validate_master_cfg.sh"
 

diff --git a/.github/workflows/bbw_build_container.yml b/.github/workflows/bbw_build_container.yml
@@ -82,10 +82,6 @@ jobs:
             image: ubuntu:22.04
             branch: 10.11
             platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
-          - dockerfile: debian.Dockerfile
-            image: ubuntu:23.04
-            branch: 10.11
-            platforms: linux/amd64, linux/arm64/v8
           - dockerfile: debian.Dockerfile
             image: ubuntu:23.10
             branch: 10.11

diff --git a/constants.py b/constants.py
@@ -7,8 +7,6 @@
     "10.4",
     "10.5",
     "10.6",
-    "10.8",
-    "10.10",
     "10.11",
     "11.0",
     "11.1",
@@ -23,6 +21,7 @@
 
 # Defines what builders report status to GitHub
 github_status_builders = [
+    "aarch64-macos",
     "amd64-centos-7",
     "amd64-centos-7-rpm-autobake",
     "amd64-debian-10",
@@ -50,7 +49,6 @@
 builders_galera_mtr = [
     "aarch64-debian-12",
     "amd64-fedora-39",
-    "amd64-ubuntu-2304",
     "s390x-ubuntu-2004",
     "s390x-ubuntu-2204",
     "ppc64le-ubuntu-2004",
@@ -104,9 +102,20 @@
     "ppc64le-ubuntu-2004",
     "ppc64le-ubuntu-2004-debug",
     "ppc64le-ubuntu-2004-without-server",
+    "x86-debian-12-fulltest",
+]
+
+supportedPlatforms["10.5"] = supportedPlatforms["10.4"].copy()
+
+# Add only 10.4 supported platforms
+supportedPlatforms["10.4"] += [
+    "amd64-kvm-centos-6-bintar",
+    "amd64-kvm-ubuntu-1210-bintar",
+    "x86-kvm-centos-6-bintar",
+    "x86-kvm-ubuntu-1210-bintar",
 ]
 
-supportedPlatforms["10.5"] = [
+supportedPlatforms["10.5"] += [
     "aarch64-centos-stream9",
     "aarch64-debian-11",
     "aarch64-fedora-38",
@@ -115,6 +124,7 @@
     "amd64-centos-stream9",
     "amd64-debian-11",
     "amd64-debian-11-msan",
+    "amd64-debian-11-msan-clang-16",
     "amd64-debian-12-asan-ubsan",
     "amd64-debian-12-rocksdb",
     "amd64-fedora-38",
@@ -132,9 +142,18 @@
     "s390x-sles-15",
     "s390x-ubuntu-2004",
 ]
-supportedPlatforms["10.5"] += supportedPlatforms["10.4"]
 
-supportedPlatforms["10.6"] = [
+supportedPlatforms["10.6"] = supportedPlatforms["10.5"].copy()
+
+# Add only 10.5 supported platforms
+supportedPlatforms["10.5"] += [
+    "amd64-kvm-centos-6-bintar",
+    "amd64-kvm-ubuntu-1604-bintar",
+    "x86-kvm-centos-6-bintar",
+    "x86-kvm-ubuntu-1604-bintar",
+]
+
+supportedPlatforms["10.6"] += [
     "aarch64-ubuntu-2204",
     "amd64-almalinux-8",
     "amd64-almalinux-9",
@@ -145,7 +164,6 @@
     "s390x-ubuntu-2204",
     "x86-debian-12",
 ]
-supportedPlatforms["10.6"] += supportedPlatforms["10.5"]
 
 supportedPlatforms["10.9"] = supportedPlatforms["10.6"].copy()
 
@@ -157,11 +175,9 @@
 supportedPlatforms["10.11"] = [
     "aarch64-debian-12",
     "aarch64-debian-sid",
-    "aarch64-ubuntu-2304",
     "aarch64-ubuntu-2310",
     "amd64-debian-12",
     "amd64-debian-sid",
-    "amd64-ubuntu-2304",
     "amd64-ubuntu-2310",
     "ppc64le-debian-sid",
     "x86-debian-sid",

diff --git a/cross-reference/crossreference/cr/models.py b/cross-reference/crossreference/cr/models.py
@@ -145,12 +145,12 @@ def select_test_failures(filters, include_failures=True):
     ],
     'test_name': [
       {
-        'pattern': '^[a-zA-Z0-9_.-]*$',
+        'pattern': '^[/a-zA-Z0-9_.-]*$',
         'filter': [('test_name__exact', 'AND')],
         'replace': False
       },
       {
-        'pattern': '^\*\.[a-zA-Z0-9_.-]*$',
+        'pattern': '^\*\.[/a-zA-Z0-9_.-]*$',
         'filter': [('test_name__icontains', 'AND')],
         'replace': True
       }

diff --git a/docker-compose/.env b/docker-compose/.env
@@ -8,3 +8,4 @@ ARTIFACTS_URL="https://ci.mariadb.org"
 NGINX_ARTIFACTS_VHOST="ci.mariadb.org"
 ENVIRON="PROD"
 BRANCH="main"
+MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel8-docker"
diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev
@@ -9,3 +9,4 @@ ARTIFACTS_URL="https://ci.dev.mariadb.org"
 NGINX_ARTIFACTS_VHOST="ci.dev.mariadb.org"
 ENVIRON="DEV"
 BRANCH="dev"
+MASTER_NONLATENT_DOCKERLIBRARY_WORKER="bb-rhel9-docker"
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -413,7 +413,7 @@ services:
       - MASTER_PACKAGES_DIR
       - MQ_ROUTER_URL
       - BUILDMASTER_URL
-      - PORT=10004
+      - PORT=10007
     hostname: master-docker-nonstandard-2
     volumes:
       - ./logs:/var/log/buildbot
@@ -498,6 +498,39 @@ services:
     depends_on:
       - mariadb
       - crossbar
+  master-bintars:
+    image: quay.io/mariadb-foundation/bb-master:master
+    restart: unless-stopped
+    container_name: master-bintars
+    environment:
+      - GALERA_PACKAGES_DIR
+      - ENVIRON
+      - TITLE
+      - BRANCH
+      - ARTIFACTS_URL
+      - TITLE_URL
+      - BUILDMASTER_WG_IP
+      - NGINX_ARTIFACTS_VHOST
+      - MASTER_PACKAGES_DIR
+      - MQ_ROUTER_URL
+      - BUILDMASTER_URL
+      - PORT=10004
+    hostname: master-bintars
+    volumes:
+      - ./logs:/var/log/buildbot
+      - ./buildbot/:/srv/buildbot/master
+    entrypoint:
+      - /bin/bash
+      - -c
+      - "/srv/buildbot/master/docker-compose/start.sh master-bintars"
+    networks:
+      net_front:
+      net_back:
+    ports:
+      - "100.64.101.1:10008:10008"
+    depends_on:
+      - mariadb
+      - crossbar
 
 networks:
   net_front:

diff --git a/docker-compose/generate-config.py b/docker-compose/generate-config.py
@@ -20,6 +20,7 @@
     "master-galera",
     "master-protected-branches",
     "master-docker-nonstandard-2",
+    "master-bintars",
 ]
 
 START_TEMPLATE = """

diff --git a/master-bintars/buildbot.tac b/master-bintars/buildbot.tac
@@ -0,0 +1,33 @@
+import os
+
+from twisted.application import service
+from buildbot.master import BuildMaster
+
+basedir = '.'
+log_basedir = '/var/log/buildbot/'
+
+rotateLength = 20000000
+maxRotatedFiles = 30
+configfile = 'master.cfg'
+
+# Default umask for server
+umask = None
+
+# if this is a relocatable tac file, get the directory containing the TAC
+if basedir == '.':
+    import os
+    basedir = os.path.abspath(os.path.dirname(__file__))
+
+# note: this line is matched against to check that this is a buildmaster
+# directory; do not edit it.
+application = service.Application('buildmaster')
+from twisted.python.logfile import LogFile
+from twisted.python.log import ILogObserver, FileLogObserver
+logfile = LogFile.fromFullPath(os.path.join(log_basedir, "master-bintars.log"), rotateLength=rotateLength,
+                                maxRotatedFiles=maxRotatedFiles)
+application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
+
+m = BuildMaster(basedir, configfile, umask)
+m.setServiceParent(application)
+m.log_rotation.rotateLength = rotateLength
+m.log_rotation.maxRotatedFiles = maxRotatedFiles