Skip to content

Commit b2d5f2e

Browse files
Get master-migration ready for production deployment
In a good enough state to deploy: https://buildbot.dev.mariadb.org/#/builders/572/builds/6 https://buildbot.dev.mariadb.org/#/builders/573/builds/9 TODO's before release: - define & enable PROD worker on hz-bbw8 - master-private update
1 parent f4e3cf9 commit b2d5f2e

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

constants.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
"amd64-rhel-7",
124124
"amd64-rhel-8",
125125
"amd64-rhel-9",
126+
"amd64-rhel-9-rpm-autobake-migration",
126127
"amd64-last-N-failed",
127128
"amd64-ubuntu-2004",
128129
"amd64-ubuntu-2004-debug",
@@ -147,10 +148,6 @@
147148
"x86-debian-12-fulltest-debug",
148149
]
149150

150-
# FIXME: Temporary until master-migration is validated on dev
151-
if os.environ["ENVIRON"] == "DEV":
152-
SUPPORTED_PLATFORMS["10.5"].append("amd64-rhel-9-rpm-autobake-migration")
153-
154151
SUPPORTED_PLATFORMS["10.6"] = SUPPORTED_PLATFORMS["10.5"].copy()
155152

156153
SUPPORTED_PLATFORMS["10.6"] += [
@@ -177,6 +174,7 @@
177174
"aarch64-ubuntu-2404",
178175
"amd64-centos-stream10",
179176
"amd64-debian-12",
177+
"amd64-debian-12-deb-autobake-migration",
180178
"amd64-debian-12-debug-embedded",
181179
"amd64-fedora-40",
182180
"amd64-fedora-41",
@@ -190,10 +188,6 @@
190188
"ppc64le-debian-12",
191189
]
192190

193-
# FIXME: Temporary until master-migration is validated on dev
194-
if os.environ["ENVIRON"] == "DEV":
195-
SUPPORTED_PLATFORMS["10.11"].append("amd64-debian-12-deb-autobake-migration")
196-
197191
SUPPORTED_PLATFORMS["10.11"] += SUPPORTED_PLATFORMS["10.10"]
198192

199193
SUPPORTED_PLATFORMS["11.0"] = SUPPORTED_PLATFORMS["10.11"].copy()

docker-compose/generate-config.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"master-galera",
2323
"master-protected-branches",
2424
"master-docker-nonstandard-2",
25+
"master-migration",
2526
]
2627

2728
VOLUMES = ["./logs:/var/log/buildbot", "./buildbot/:/srv/buildbot/master"]
@@ -151,10 +152,6 @@ def construct_env_section(env_vars):
151152

152153

153154
def main(args):
154-
# FIXME: Temporary until master-migration is validated on dev
155-
if args.env == "dev":
156-
MASTER_DIRECTORIES.append("master-migration")
157-
158155
# Load Volumes
159156
master_volumes = {
160157
key: VOLUMES[:]

0 commit comments

Comments
 (0)