Skip to content

Commit 5cb7a57

Browse files
RazvanLiviuVarzaruRazvanLiviuVarzaru
committed
draft - remove 10.5 support and remove eol ub2004
- docker library - needs bump 10.6 to jammy in docker gh project - remove release ub2004 builders (os-info) - bump ubuntu to 22.04 for integration testing builders: eco-php - bump ubuntu to 22.04 for special builders: - debug (all arches) - remove amd64 2004 builder from protected branches before prod deploy - big-test (amd64) - full - test (amd64) - without server (ppc) 10.5 is no longer supported, start SUPPORTED_PLATFORMS from 10.6
1 parent 584defc commit 5cb7a57

File tree

14 files changed

+60
-103
lines changed

14 files changed

+60
-103
lines changed

‎.github/workflows/build-debian-based.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ jobs:
6060
tag: debiansid-386
6161
nogalera: false
6262

63-
- image: ubuntu:20.04
64-
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
65-
branch: 10.11
66-
nogalera: false
67-
6863
- image: ubuntu:22.04
6964
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
7065
branch: 10.11

‎ci_build_images/debian.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN . /etc/os-release \
3434
devscripts \
3535
equivs \
3636
lsb-release \
37-
&& if [ "${VERSION_ID}" = "20.04" ]; then apt-get -y install --no-install-recommends g++-10; fi \
3837
&& if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); echo /* galera-4 */; fi \
3938
&& if curl --head --silent "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" | head -n1 | grep -q 200; then \
4039
curl -s "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources; fi \
@@ -84,7 +83,7 @@ RUN . /etc/os-release \
8483
sudo \
8584
wget \
8685
&& if [ "$(getconf LONG_BIT)" = 64 ]; then apt-get -y install --no-install-recommends galera-4; fi \
87-
&& if [ "${VERSION_ID}" != 20.04 ] && [ "${VERSION_ID}" != 11 ]; then \
86+
&& if [ "${VERSION_ID}" != 11 ]; then \
8887
# Bootstrap MDEV-32686 so only temporary until https://github.com/MariaDB/server/pull/3692 merged up \
8988
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends dh-package-notes; \
9089
fi \

‎constants.py

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
# Used to trigger the appropriate main branch
88
BRANCHES_MAIN = [
9-
"10.5",
109
"10.6",
1110
"10.11",
1211
"11.0",
@@ -52,17 +51,17 @@
5251
"amd64-debian-11-debug-ps-embedded",
5352
"amd64-debian-11-msan-clang-16",
5453
"amd64-fedora-40",
55-
"amd64-ubuntu-2004-debug",
54+
"amd64-ubuntu-2204-debug",
5655
"amd64-ubuntu-2204-debug-ps",
5756
"amd64-windows",
5857
]
5958

6059
# Special builders triggering
61-
BUILDERS_BIG = ["amd64-ubuntu-2004-bigtest"]
60+
BUILDERS_BIG = ["amd64-ubuntu-2204-bigtest"]
6261
BUILDERS_ECO = [
6362
"amd64-debian-10-eco-mysqljs",
6463
"amd64-debian-10-eco-pymysql",
65-
"amd64-ubuntu-2004-eco-php",
64+
"amd64-ubuntu-2204-eco-php",
6665
]
6766

6867
if os.environ["ENVIRON"] == "DEV":
@@ -74,15 +73,15 @@
7473

7574
BUILDERS_GALERA_MTR = [
7675
"aarch64-debian-12",
77-
"s390x-ubuntu-2004",
7876
"s390x-ubuntu-2204",
79-
"ppc64le-ubuntu-2004",
77+
"s390x-ubuntu-2204",
78+
"ppc64le-ubuntu-2204",
8079
"ppc64le-ubuntu-2204",
8180
"amd64-freebsd-14",
8281
]
8382
BUILDERS_S3_MTR = [
84-
"aarch64-ubuntu-2004-debug",
85-
"amd64-ubuntu-2004-debug",
83+
"aarch64-ubuntu-2204-debug",
84+
"amd64-ubuntu-2204-debug",
8685
"s390x-sles-1506",
8786
]
8887

@@ -101,16 +100,15 @@
101100
# Maximum supported branch is the one where the default distro MariaDB package major version <= branch
102101
# For example, if Debian 10 has MariaDB 10.3 by default, we don't support MariaDB 10.2 on it.
103102
SUPPORTED_PLATFORMS = {}
104-
SUPPORTED_PLATFORMS["10.5"] = [
103+
SUPPORTED_PLATFORMS["10.6"] = [
105104
"aarch64-centos-stream9",
106105
"aarch64-debian-11",
107106
"aarch64-macos",
108107
"aarch64-macos-compile-only",
109108
"aarch64-openeuler-2403",
110109
"aarch64-rhel-8",
111110
"aarch64-rhel-9",
112-
"aarch64-ubuntu-2004",
113-
"aarch64-ubuntu-2004-debug",
111+
"aarch64-ubuntu-2204-debug",
114112
"amd64-centos-7-bintar",
115113
"amd64-centos-stream9",
116114
"amd64-debian-11",
@@ -125,9 +123,8 @@
125123
"amd64-rhel-8",
126124
"amd64-rhel-9",
127125
"amd64-last-N-failed",
128-
"amd64-ubuntu-2004",
129-
"amd64-ubuntu-2004-debug",
130-
"amd64-ubuntu-2004-fulltest",
126+
"amd64-ubuntu-2204-debug",
127+
"amd64-ubuntu-2204-fulltest",
131128
"amd64-ubuntu-2204-debug-ps",
132129
"amd64-ubuntu-2204-icc",
133130
"amd64-ubuntu-2404-clang18-asan",
@@ -137,20 +134,13 @@
137134
"ppc64le-centos-stream9",
138135
"ppc64le-rhel-8",
139136
"ppc64le-rhel-9",
140-
"ppc64le-ubuntu-2004",
141-
"ppc64le-ubuntu-2004-debug",
142-
"ppc64le-ubuntu-2004-without-server",
137+
"ppc64le-ubuntu-2204-debug",
138+
"ppc64le-ubuntu-2204-without-server",
143139
"s390x-rhel-8",
144140
"s390x-rhel-9",
145-
"s390x-ubuntu-2004",
146-
"s390x-ubuntu-2004-debug",
141+
"s390x-ubuntu-2204-debug",
147142
"x86-debian-12-fulltest",
148143
"x86-debian-12-fulltest-debug",
149-
]
150-
151-
SUPPORTED_PLATFORMS["10.6"] = SUPPORTED_PLATFORMS["10.5"].copy()
152-
153-
SUPPORTED_PLATFORMS["10.6"] += [
154144
"aarch64-ubuntu-2204",
155145
"amd64-msan-clang-20",
156146
"amd64-ubuntu-2204",

‎dockerfiles/eco-php-ubuntu-2004.dockerfile renamed to ‎dockerfiles/eco-php-ubuntu-2204.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Provides a base Ubuntu image with latest buildbot worker installed
55
# and PHP build dependencies
66

7-
FROM ubuntu:20.04
7+
FROM ubuntu:22.04
88
LABEL maintainer="MariaDB Buildbot maintainers"
99

1010
ARG DEBIAN_FRONTEND=noninteractive

‎master-config.yaml-sample

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ builders:
55
- aarch64-debian-sid
66
- aarch64-rhel-8
77
- aarch64-rhel-9
8-
- aarch64-ubuntu-2004
98
- aarch64-ubuntu-2204
109
log_name: master-docker-aarch64-0.log
1110
port: 9998

‎master-docker-nonstandard/master.cfg

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ def addWorker(
100100
## hz-bbw2-docker
101101
ECO_DOCKERFILE_BASE_URL = "https://github.com/MariaDB/buildbot/tree/main/dockerfiles/"
102102
ECO_MYSQLJS_DOCKERFILE = "eco-mysqljs-nodejs15-buster.dockerfile"
103-
ECO_PHP_DOCKERFILE = "eco-php-ubuntu-2004.dockerfile"
103+
ECO_PHP_DOCKERFILE = "eco-php-ubuntu-2204.dockerfile"
104104
ECO_PYMYSQL_DOCKERFILE = "eco-pymysql-python-3-9-slim-buster.dockerfile"
105105
c["workers"].append(
106106
worker.DockerLatentWorker(
107-
"hz-bbw2-docker-eco-php-ubuntu-2004",
107+
"hz-bbw2-docker-eco-php-ubuntu-2204",
108108
None,
109109
docker_host=config["private"]["docker_workers"]["hz-bbw2-docker"],
110110
dockerfile=open(f"dockerfiles/{ECO_PHP_DOCKERFILE}").read(),
@@ -181,10 +181,10 @@ c["workers"].append(
181181
MASTER_PACKAGES = os.environ["MASTER_PACKAGES_DIR"]
182182
c["workers"].append(
183183
worker.DockerLatentWorker(
184-
"bm-bbw1-docker-ubuntu-2004",
184+
"bm-bbw1-docker-ubuntu-2204",
185185
None,
186186
docker_host=config["private"]["docker_workers"]["bm-bbw1-docker"],
187-
image=os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
187+
image=os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
188188
followStartupLogs=False,
189189
autopull=True,
190190
alwaysPull=True,
@@ -204,8 +204,8 @@ c["workers"].append(
204204
addWorker(
205205
"hz-bbw",
206206
6,
207-
"bigtest-ubuntu-2004",
208-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
207+
"bigtest-ubuntu-2204",
208+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
209209
jobs=20,
210210
save_packages=False,
211211
)
@@ -215,17 +215,17 @@ for w_name in ["ppc64le-osuosl-bbw"]:
215215
addWorker(
216216
w_name,
217217
1,
218-
"ubuntu-2004",
219-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
218+
"ubuntu-2204",
219+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
220220
jobs=7,
221221
save_packages=True,
222222
shm_size="20G",
223223
)
224224
addWorker(
225225
w_name,
226226
1,
227-
"ubuntu-2004-debug",
228-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
227+
"ubuntu-2204-debug",
228+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
229229
jobs=30,
230230
save_packages=True,
231231
)
@@ -265,8 +265,8 @@ for w_name in ["ns-x64-bbw", "apexis-bbw"]:
265265
addWorker(
266266
w_name,
267267
i,
268-
"ubuntu-2004",
269-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
268+
"ubuntu-2204",
269+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
270270
jobs=jobs,
271271
save_packages=True,
272272
)
@@ -342,8 +342,8 @@ addWorker(
342342
addWorker(
343343
"aarch64-bbw",
344344
6,
345-
"ubuntu-2004-debug",
346-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
345+
"ubuntu-2204-debug",
346+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
347347
jobs=10,
348348
save_packages=True,
349349
)
@@ -369,26 +369,26 @@ addWorker(
369369
addWorker(
370370
"s390x-bbw",
371371
1,
372-
"ubuntu-2004-debug",
373-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
372+
"ubuntu-2204-debug",
373+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
374374
jobs=7,
375375
save_packages=False,
376376
)
377377

378378
addWorker(
379379
"s390x-bbw",
380380
2,
381-
"ubuntu-2004-debug",
382-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
381+
"ubuntu-2204-debug",
382+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
383383
jobs=7,
384384
save_packages=False,
385385
)
386386

387387
addWorker(
388388
"s390x-bbw",
389389
3,
390-
"ubuntu-2004-debug",
391-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
390+
"ubuntu-2204-debug",
391+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
392392
jobs=7,
393393
save_packages=False,
394394
)
@@ -1403,8 +1403,8 @@ c["builders"].append(
14031403

14041404
c["builders"].append(
14051405
util.BuilderConfig(
1406-
name="amd64-ubuntu-2004-eco-php",
1407-
workernames=["hz-bbw2-docker-eco-php-ubuntu-2004"],
1406+
name="amd64-ubuntu-2204-eco-php",
1407+
workernames=["hz-bbw2-docker-eco-php-ubuntu-2204"],
14081408
tags=["Ubuntu", "ecosystem", "PHP", "experimental"],
14091409
collapseRequests=True,
14101410
nextBuild=nextBuild,
@@ -1439,9 +1439,9 @@ c["builders"].append(
14391439

14401440
c["builders"].append(
14411441
util.BuilderConfig(
1442-
name="amd64-ubuntu-2004-bigtest",
1443-
workernames=["bm-bbw1-docker-ubuntu-2004"]
1444-
+ workers["x64-bbw-docker-bigtest-ubuntu-2004"],
1442+
name="amd64-ubuntu-2204-bigtest",
1443+
workernames=["bm-bbw1-docker-ubuntu-2204"]
1444+
+ workers["x64-bbw-docker-bigtest-ubuntu-2204"],
14451445
tags=["Ubuntu", "big", "gcc"],
14461446
collapseRequests=True,
14471447
nextBuild=nextBuild,
@@ -1452,8 +1452,8 @@ c["builders"].append(
14521452

14531453
c["builders"].append(
14541454
util.BuilderConfig(
1455-
name="amd64-ubuntu-2004-fulltest",
1456-
workernames=workers["x64-bbw-docker-ubuntu-2004"],
1455+
name="amd64-ubuntu-2204-fulltest",
1456+
workernames=workers["x64-bbw-docker-ubuntu-2204"],
14571457
tags=["Ubuntu", "full", "gcc"],
14581458
collapseRequests=True,
14591459
nextBuild=nextBuild,
@@ -1465,8 +1465,8 @@ c["builders"].append(
14651465

14661466
c["builders"].append(
14671467
util.BuilderConfig(
1468-
name="ppc64le-ubuntu-2004-without-server",
1469-
workernames=workers["ppc64le-bbw-docker-ubuntu-2004"],
1468+
name="ppc64le-ubuntu-2204-without-server",
1469+
workernames=workers["ppc64le-bbw-docker-ubuntu-2204"],
14701470
tags=["Ubuntu", "without-server", "gcc", "pc9"],
14711471
collapseRequests=True,
14721472
nextBuild=nextBuild,
@@ -1576,8 +1576,8 @@ c["builders"].append(
15761576

15771577
c["builders"].append(
15781578
util.BuilderConfig(
1579-
name="aarch64-ubuntu-2004-debug",
1580-
workernames=workers["aarch64-bbw-docker-ubuntu-2004-debug"],
1579+
name="aarch64-ubuntu-2204-debug",
1580+
workernames=workers["aarch64-bbw-docker-ubuntu-2204-debug"],
15811581
tags=["Ubuntu", "quick", "gcc", "debug"],
15821582
collapseRequests=True,
15831583
nextBuild=nextBuild,
@@ -1594,8 +1594,8 @@ c["builders"].append(
15941594

15951595
c["builders"].append(
15961596
util.BuilderConfig(
1597-
name="ppc64le-ubuntu-2004-debug",
1598-
workernames=workers["ppc64le-bbw-docker-ubuntu-2004-debug"],
1597+
name="ppc64le-ubuntu-2204-debug",
1598+
workernames=workers["ppc64le-bbw-docker-ubuntu-2204-debug"],
15991599
tags=["Ubuntu", "quick", "gcc", "debug"],
16001600
collapseRequests=True,
16011601
nextBuild=nextBuild,
@@ -1612,8 +1612,8 @@ c["builders"].append(
16121612

16131613
c["builders"].append(
16141614
util.BuilderConfig(
1615-
name="s390x-ubuntu-2004-debug",
1616-
workernames=workers["s390x-bbw-docker-ubuntu-2004-debug"],
1615+
name="s390x-ubuntu-2204-debug",
1616+
workernames=workers["s390x-bbw-docker-ubuntu-2204-debug"],
16171617
tags=["Ubuntu", "quick", "gcc", "debug"],
16181618
collapseRequests=True,
16191619
nextBuild=nextBuild,

‎master-galera/master.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,6 @@ for os_i in OS_INFO:
449449
factory = f_deb_build
450450

451451
env = {}
452-
if os_i == "ubuntu-2004":
453-
env = {"CC": "gcc-10", "CXX": "g++-10"}
454452

455453
c["builders"].append(
456454
util.BuilderConfig(

‎master-protected-branches/master.cfg

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,8 @@ for w_name in ["hz-bbw"]:
168168
addWorker(
169169
w_name,
170170
i,
171-
"ubuntu-2004-clang",
172-
"vladbogo/bb:amd64-ubuntu-2004-clang",
173-
jobs=jobs,
174-
save_packages=True,
175-
)
176-
addWorker(
177-
w_name,
178-
i,
179-
"ubuntu-2004-debug",
180-
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu20.04",
171+
"ubuntu-2204-debug",
172+
os.environ["CONTAINER_REGISTRY_URL"] + "ubuntu22.04",
181173
jobs=14,
182174
save_packages=True,
183175
)
@@ -400,8 +392,8 @@ c["builders"].append(
400392

401393
c["builders"].append(
402394
util.BuilderConfig(
403-
name="amd64-ubuntu-2004-debug",
404-
workernames=workers["x64-bbw-docker-ubuntu-2004-debug"],
395+
name="amd64-ubuntu-2204-debug",
396+
workernames=workers["x64-bbw-docker-ubuntu-2204-debug"],
405397
tags=["Ubuntu", "quick", "gcc", "debug", "protected"],
406398
collapseRequests=True,
407399
nextBuild=nextBuild,

‎master-web/templates/home.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
li
7272
| Debian 10, 11, 12 and Sid
7373
li
74-
| Ubuntu 20.04, 22.04, 23.10, 24.04
74+
| Ubuntu 22.04, 23.10, 24.04
7575
li
7676
| Fedora 38, 39 and 40
7777
li

0 commit comments

Comments
 (0)