From 27958262a09f9f08457c378e9eb91633d1721b78 Mon Sep 17 00:00:00 2001 From: Vlad Bogolin Date: Tue, 7 May 2024 21:59:31 +0300 Subject: [PATCH 1/8] Increase shm_size for x86-debian-12-full-test builder --- master-docker-nonstandard-2/master.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg index 98179be0..1e2dba8b 100644 --- a/master-docker-nonstandard-2/master.cfg +++ b/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( From b9a9c26af0f315706fb031d7fd5ef245cf236d69 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 24 Apr 2024 11:25:12 +1000 Subject: [PATCH 2/8] hasCompat simplify Fedora case was always false (was only comparing one char), but given that we're only doing 38+ it doesn't matter any more. Compact on rejections. --- utils.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/utils.py b/utils.py index 4b8b062f..f07fe06d 100644 --- a/utils.py +++ b/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 From f4c236b4da1b87067c7e2f4ad56d698010561d89 Mon Sep 17 00:00:00 2001 From: Vlad Bogolin Date: Fri, 24 May 2024 13:09:52 +0300 Subject: [PATCH 3/8] Add protected tag to aarch64-macos-compile-only The tag must be added because the builder is used for branch protection --- master-nonlatent/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master-nonlatent/master.cfg b/master-nonlatent/master.cfg index 81c9ad14..5a831d80 100644 --- a/master-nonlatent/master.cfg +++ b/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), From c9a8e4ffdc31779d8654c2417a49668e2f9c5a3d Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Thu, 16 May 2024 12:46:19 +0200 Subject: [PATCH 4/8] Skip E0606, # possibly-used-before-assignment --- .pylintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.pylintrc b/.pylintrc index f5c1e7cb..23868a9a 100644 --- a/.pylintrc +++ b/.pylintrc @@ -10,6 +10,7 @@ disable= W0122, # exec-used W1514, # unspecified-encoding E0611, # no-name-in-module + E0606, # possibly-used-before-assignment # Analyse import fallback blocks. This can be used to support both Python 2 and # 3 compatible code, which means that the block might have code that exists From c5d5bdc93874db3722fa0b91aa47571143f5283d Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Mon, 27 May 2024 11:20:34 +0200 Subject: [PATCH 5/8] Repo needs to be adapted on all RHEL8 based distro Error is: |Last metadata expiration check: 0:00:02 ago on Thu 23 May 2024 11:16:33 AM UTC. |All matches were filtered out by modular filtering for argument: MariaDB-devel | * Maybe you meant: mariadb-devel |All matches were filtered out by modular filtering for argument: MariaDB-server | * Maybe you meant: mariadb-server |All matches were filtered out by modular filtering for argument: MariaDB-test | * Maybe you meant: mariadb-test --- common_factories.py | 2 +- scripts/bash_lib.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common_factories.py b/common_factories.py index ff7e9822..dc57f48c 100644 --- a/common_factories.py +++ b/common_factories.py @@ -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 """, diff --git a/scripts/bash_lib.sh b/scripts/bash_lib.sh index 6b5adde4..3e5671de 100644 --- a/scripts/bash_lib.sh +++ b/scripts/bash_lib.sh @@ -291,7 +291,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 From 5539ed4279298414e5f76070cefa2fef8294160f Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Thu, 23 May 2024 14:11:02 +0200 Subject: [PATCH 6/8] Unused file --- utilities.py | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 utilities.py diff --git a/utilities.py b/utilities.py deleted file mode 100644 index 53e04aa9..00000000 --- a/utilities.py +++ /dev/null @@ -1,39 +0,0 @@ -from buildbot.plugins import * -from buildbot.steps.shell import ShellCommand - -# This file is for storing all utility functions used within buildbot's master.cfg -# The goal is to clean up the master.cfg such that only basic declarative logic is -# needed in master.cfg -def checkoutUsingGitWorktree(): - return ShellCommand( - name="fetch_using_git", - description="fetching using git", - descriptionDone="fetch and git checked out...done", - haltOnFailure=True, - command=["bash", "-xc", util.Interpolate(""" - d=/mnt/packages/ - cd "$d" - revision="%(prop:revision)s" - branch="%(prop:branch)s" - basebranch=${branch#*-} - basebranch=${basebranch%%-*} - [ ! -d mariadb-server ] && git clone https://github.com/MariaDB/server.git mariadb-server - - # PR? curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/MariaDB/server/pulls/333 | jq .base.ref - # git fetch origin "$branch"? - [[ $basebranch =~ [0-9]+\.[0-9]+ ]] || exit 1 - if [ ! -d mariadb-server-$basebranch ] - then - cd mariadb-server - git worktree add ../mariadb-server-$basebranch $basebranch - git submodule update --init --recursive --jobs 6 - cd .. - fi - - cd mariadb-server-$basebranch - git fetch origin - git clean -dfx - git checkout $revision - git submodule update --recursive -""")]) - From 12335eeb8f54733e9514d075c27ba9b3be7eb0e7 Mon Sep 17 00:00:00 2001 From: Vlad Bogolin Date: Mon, 27 May 2024 23:26:08 +0300 Subject: [PATCH 7/8] Trigger amd64-sles-15 --- constants.py | 1 + 1 file changed, 1 insertion(+) diff --git a/constants.py b/constants.py index 01bfa9ed..f7eec62e 100644 --- a/constants.py +++ b/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", From 7207fbfbb3fb5606d2d6b37a4327f4b896aba6ff Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 30 May 2024 10:45:25 +0200 Subject: [PATCH 8/8] last-N-failed: remove duplicates from the test list --- common_factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_factories.py b/common_factories.py index dc57f48c..ac5df710 100644 --- a/common_factories.py +++ b/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