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.

Sign up for GitHub

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

New builders #272

Merged
merged 2 commits into from
Jan 2, 2024
Merged

New builders #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1ae35
Black formatting
vladbogo Jan 2, 2024
6c7e2f5
Add last N failed builders
vladbogo Jan 2, 2024
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
30 changes: 17 additions & 13 deletions constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
"amd64-debian-10",
"amd64-debian-10-debug-embedded",
"amd64-debian-10-deb-autobake",
"amd64-debian-10-last-N-failed",
"amd64-debian-11-debug-ps-embedded",
"amd64-debian-11-msan",
"amd64-fedora-38",
"amd64-fedora-38-last-N-failed",
"amd64-ubuntu-2004-debug",
"amd64-ubuntu-2204-debug-ps",
"amd64-windows",
Expand Down Expand Up @@ -83,6 +85,7 @@
"amd64-centos-stream8",
"amd64-debian-10",
"amd64-debian-10-debug-embedded",
"amd64-debian-10-last-N-failed",
"amd64-debian-11-debug-ps-embedded",
"amd64-opensuse-15",
"amd64-rhel-7",
Expand Down Expand Up @@ -118,6 +121,7 @@
"amd64-debian-12-rocksdb",
"amd64-fedora-37",
"amd64-fedora-38",
"amd64-fedora-38-last-N-failed",
"amd64-fedora-39",
"amd64-freebsd-14",
"amd64-rhel-9",
Expand Down Expand Up @@ -187,19 +191,19 @@
# * debug/asan/msan/ubsan tests need a type, because it's not enough to
# run `./mtr testname`, they need a special build
test_type_to_mtr_arg = {
"nm" : "",
"ps" : "--ps-protocol",
"emb" : "--embedded",
"emb-ps" : "--embedded --ps-protocol",
"view" : "--view-protocol",
"asan" : "",
"msan" : "",
"ubsan" : "",
"valgrind" : "",
"debug" : "",
"debug-ps" : "--ps-protocol",
"debug-emb" : "--embedded",
"debug-emb-ps" : "--embedded --ps-protocol",
"nm": "",
"ps": "--ps-protocol",
"emb": "--embedded",
"emb-ps": "--embedded --ps-protocol",
"view": "--view-protocol",
"asan": "",
"msan": "",
"ubsan": "",
"valgrind": "",
"debug": "",
"debug-ps": "--ps-protocol",
"debug-emb": "--embedded",
"debug-emb-ps": "--embedded --ps-protocol",
}

# =============================================================================
Expand Down
58 changes: 51 additions & 7 deletions master-protected-branches/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ for w_name in ["hz-bbw"]:
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
"-debian-10-last-N-failed",
"quay.io/mariadb-foundation/bb-worker:debian10",
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
Expand All @@ -219,6 +227,14 @@ for w_name in ["hz-bbw"]:
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
"-fedora-38-last-N-failed",
"quay.io/mariadb-foundation/bb-worker:fedora38",
jobs=jobs,
save_packages=True,
)
addWorker(
w_name,
i,
Expand Down Expand Up @@ -449,7 +465,7 @@ c["builders"].append(
"additional_args": "-DWITH_DBUG_TRACE=OFF -DHAVE_valgrind",
"mtr_additional_args": '--skip-test="main\.show_analyze_json"',
},
factory=getQuickBuildFactory('debug', mtrDbPool),
factory=getQuickBuildFactory("debug", mtrDbPool),
)
)

Expand All @@ -468,7 +484,7 @@ c["builders"].append(
"create_package": " ",
"mtr_additional_args": '--skip-test="main\.show_analyze_json"',
},
factory=getQuickBuildFactory('debug-ps', mtrDbPool),
factory=getQuickBuildFactory("debug-ps", mtrDbPool),
)
)

Expand All @@ -487,7 +503,7 @@ c["builders"].append(
"additional_args": "-DWITH_EMBEDDED_SERVER:BOOL=ON -DWITH_DBUG_TRACE=OFF",
"mtr_additional_args": '--skip-test="main\.show_analyze_json"',
},
factory=getQuickBuildFactory('debug-emb', mtrDbPool),
factory=getQuickBuildFactory("debug-emb", mtrDbPool),
)
)

Expand All @@ -506,7 +522,7 @@ c["builders"].append(
"additional_args": "-DWITH_EMBEDDED_SERVER:BOOL=ON -DWITH_DBUG_TRACE=OFF",
"mtr_additional_args": '--skip-test="main\.show_analyze_json"',
},
factory=getQuickBuildFactory('debug-emb-ps', mtrDbPool),
factory=getQuickBuildFactory("debug-emb-ps", mtrDbPool),
)
)

Expand All @@ -520,7 +536,21 @@ c["builders"].append(
canStartBuild=canStartBuild,
locks=getLocks,
properties={"mtr_additional_args": protected_branches_mtr_additional_args},
factory=getLastNFailedBuildsFactory('nm', mtrDbPool),
factory=getQuickBuildFactory("nm", mtrDbPool),
)
)

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

Expand All @@ -534,7 +564,21 @@ c["builders"].append(
canStartBuild=canStartBuild,
locks=getLocks,
properties={"mtr_additional_args": protected_branches_mtr_additional_args},
factory=getLastNFailedBuildsFactory('debug', mtrDbPool),
factory=getQuickBuildFactory("nm", mtrDbPool),
)
)

c["builders"].append(
util.BuilderConfig(
name="amd64-fedora-38-last-N-failed",
workernames=workers["x64-bbw-docker-fedora-38-last-N-failed"],
tags=["Fedora", "quick", "gcc", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
canStartBuild=canStartBuild,
locks=getLocks,
properties={"mtr_additional_args": protected_branches_mtr_additional_args},
factory=getLastNFailedBuildsFactory("debug", mtrDbPool),
)
)

Expand All @@ -548,7 +592,7 @@ c["builders"].append(
canStartBuild=canStartBuild,
locks=getLocks,
properties={"mtr_additional_args": protected_branches_mtr_additional_args},
factory=getQuickBuildFactory('nm', mtrDbPool),
factory=getQuickBuildFactory("nm", mtrDbPool),
)
)

Expand Down