Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDBF-784 - add debian-12 / fedora-40 to status builders #556

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
"aarch64-macos-compile-only",
"amd64-centos-7",
"amd64-centos-7-rpm-autobake",
"amd64-debian-10",
"amd64-debian-10-debug-embedded",
"amd64-debian-10-deb-autobake",
"amd64-debian-10-last-N-failed",
"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-38",
"amd64-fedora-38-last-N-failed",
"amd64-fedora-40",
"amd64-fedora-40-last-N-failed",
"amd64-ubuntu-2004-debug",
"amd64-ubuntu-2204-debug-ps",
"amd64-windows",
Expand Down Expand Up @@ -82,10 +82,8 @@
supportedPlatforms = {}
supportedPlatforms["10.5"] = [
"aarch64-centos-stream9",
"aarch64-debian-10",
"aarch64-debian-10-bintar",
"aarch64-debian-11",
"aarch64-fedora-38",
"aarch64-fedora-39",
"aarch64-macos",
"aarch64-macos-compile-only",
Expand All @@ -96,17 +94,12 @@
"amd64-centos-7",
"amd64-centos-7-bintar",
"amd64-centos-stream9",
"amd64-debian-10",
"amd64-debian-10-debug-embedded",
"amd64-debian-10-last-N-failed",
"amd64-debian-11",
"amd64-debian-11-debug-ps-embedded",
"amd64-debian-11-msan",
"amd64-debian-11-msan-clang-16",
"amd64-debian-12-asan-ubsan",
"amd64-debian-12-rocksdb",
"amd64-fedora-38",
"amd64-fedora-38-last-N-failed",
"amd64-fedora-39",
"amd64-fedora-40-valgrind",
"amd64-freebsd-14",
Expand Down
2 changes: 0 additions & 2 deletions master-config.yaml-sample
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
builders:
- aarch64-centos-stream9
- aarch64-debian-10
- aarch64-debian-11
- aarch64-debian-12
- aarch64-debian-sid
- aarch64-fedora-38
- aarch64-rhel-8
- aarch64-rhel-9
- aarch64-ubuntu-2004
Expand Down
2 changes: 1 addition & 1 deletion master-private.cfg-sample
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private["user_pass"]= {
"admin":"user_pass",
}
private["master-variables"] = {
"max_builds": 15,
"max_builds": 16,
"starting_port": 9996,
"workers": {
"amd64": [
Expand Down
52 changes: 26 additions & 26 deletions master-protected-branches/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -190,48 +190,48 @@ for w_name in ["hz-bbw"]:
addWorker(
w_name,
i,
"-debian-10",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian10",
jobs=jobs,
save_packages=True,
"-debian-11-debug-ps-embed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian11",
jobs=14,
save_packages=False,
)
addWorker(
w_name,
i,
"-debian-10-last-N-failed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian10",
"-debian-12",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian12",
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
"-debian-10-debug-embed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian10",
jobs=14,
save_packages=False,
"-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,
"-debian-11-debug-ps-embed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian11",
"-debian-12-debug-embed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "debian12",
jobs=14,
save_packages=False,
)
addWorker(
w_name,
i,
"-fedora-38",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "fedora38",
"-fedora-40",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "fedora40",
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
"-fedora-38-last-N-failed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "fedora38",
"-fedora-40-last-N-failed",
os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "fedora40",
jobs=jobs,
save_packages=True,
)
Expand Down Expand Up @@ -505,8 +505,8 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-debian-10-debug-embedded",
workernames=workers["x64-bbw-docker-debian-10-debug-embed"],
name="amd64-debian-12-debug-embedded",
workernames=workers["x64-bbw-docker-debian-12-debug-embed"],
tags=["Ubuntu", "quick", "gcc", "debug", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
Expand Down Expand Up @@ -543,8 +543,8 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-debian-10",
workernames=workers["x64-bbw-docker-debian-10"],
name="amd64-debian-12",
workernames=workers["x64-bbw-docker-debian-12"],
tags=["Debian", "quick", "gcc", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
Expand All @@ -557,8 +557,8 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-debian-10-last-N-failed",
workernames=workers["x64-bbw-docker-debian-10-last-N-failed"],
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,
Expand All @@ -571,8 +571,8 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-fedora-38",
workernames=workers["x64-bbw-docker-fedora-38"],
name="amd64-fedora-40",
workernames=workers["x64-bbw-docker-fedora-40"],
tags=["Fedora", "quick", "gcc", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
Expand All @@ -585,8 +585,8 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-fedora-38-last-N-failed",
workernames=workers["x64-bbw-docker-fedora-38-last-N-failed"],
name="amd64-fedora-40-last-N-failed",
workernames=workers["x64-bbw-docker-fedora-40-last-N-failed"],
tags=["Fedora", "quick", "gcc", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
Expand Down
12 changes: 0 additions & 12 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ centos-stream9:
- aarch64
- ppc64le
type: rpm
debian-10:
version_name: buster
arch:
- amd64
- aarch64
type: deb
debian-11:
version_name: bullseye
arch:
Expand All @@ -54,12 +48,6 @@ debian-sid:
- ppc64le
- x86
type: deb
fedora-38:
version_name: 38
arch:
- amd64
- aarch64
type: rpm
fedora-39:
version_name: 39
arch:
Expand Down