Skip to content

Commit 3a3cf28

Browse files
committed
MDBF-1156: Add Ubuntu 26.04 to buildbot
LTS release as such contains 4 arches. Also Ubuntu is performing amd64v3 builds based on https://discourse.ubuntu.com/t/introducing-architecture-variants-amd64v3-now-available-in-ubuntu-25-10/71312. This has already thrown up errors on MDEV-38398. To account for this, add a ubuntu:26.04v3 builder so we've got something working for Ubuntu's release. Its currently unclear if we'll be doing a v3 release.
1 parent f60c43d commit 3a3cf28

File tree

7 files changed

+44
-2
lines changed

7 files changed

+44
-2
lines changed

.github/workflows/bbw_build_container_template.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ on:
2828
install_valgrind:
2929
required: false
3030
type: string
31+
arch_variant:
32+
required: false
33+
type: string
3134
files:
3235
required: false
3336
type: string
@@ -142,7 +145,8 @@ jobs:
142145
--build-arg BASE_IMAGE=${{ inputs.image }} \
143146
--build-arg CLANG_VERSION=${{ inputs.clang_version }} \
144147
--build-arg MARIADB_BRANCH=${{ inputs.branch }} \
145-
--build-arg INSTALL_VALGRIND="${{ inputs.install_valgrind }}"
148+
--build-arg INSTALL_VALGRIND="${{ inputs.install_valgrind }}" \
149+
--build-arg ARCH_VARIANT="${{ inputs.arch_variant }}"
146150
done
147151
podman images
148152

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,18 @@ jobs:
9999
branch: 11.8
100100
nogalera: false
101101

102+
- image: ubuntu:26.04
103+
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
104+
branch: 11.8
105+
nogalera: true
106+
107+
- image: ubuntu:26.04
108+
tag: ubuntu:26.04v3
109+
platforms: linux/amd64
110+
branch: 11.8
111+
nogalera: true
112+
arch_variant: amd64v3
113+
102114
uses: ./.github/workflows/bbw_build_container_template.yml
103115
with:
104116
dockerfile: ${{ matrix.dockerfile || 'debian.Dockerfile' }}
@@ -107,6 +119,7 @@ jobs:
107119
tag: ${{ matrix.tag }}
108120
branch: ${{ matrix.branch }}
109121
nogalera: ${{ matrix.nogalera }}
122+
arch_variant: ${{ matrix.arch_variant }}
110123
is_scheduled_event: ${{ inputs.is_scheduled_event || false }}
111124
deploy_on_schedule: ${{ matrix.deploy_on_schedule || false }}
112125
secrets: inherit

ci_build_images/debian.Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ RUN . /etc/os-release \
2323
exit 1; \
2424
fi
2525

26+
ARG ARCH_VARIANT=
27+
ENV ARCH_VARIANT=$ARCH_VARIANT
2628
# Install updates and required packages
2729
# see: https://cryptography.io/en/latest/installation/
2830
RUN . /etc/os-release \
31+
&& if [ -n "$ARCH_VARIANT" ]; then \
32+
echo "APT::Architecture-Variants \"$ARCH_VARIANT\";" > /etc/apt/apt.conf.d/99enable-$ARCH_VARIANT; \
33+
fi \
2934
&& apt-get update \
3035
&& apt-get -y upgrade \
3136
&& apt-get -y install --no-install-recommends \

constants.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@
227227
"amd64-ubuntu-2510",
228228
"aarch64-fedora-43",
229229
"amd64-fedora-43",
230+
"aarch64-ubuntu-2604",
231+
"amd64-ubuntu-2604",
232+
"amd64v3-ubuntu-2604-deb-autobake-migration",
233+
"ppc64le-ubuntu-2604",
234+
"s390x-ubuntu-2604",
230235
]
231236
SUPPORTED_PLATFORMS["12.0"] = SUPPORTED_PLATFORMS["11.8"].copy()
232237
SUPPORTED_PLATFORMS["12.1"] = SUPPORTED_PLATFORMS["12.0"].copy()

master-migration/master.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ c["builders"] = [
8787
image="debian12",
8888
worker_pool=DEFAULT_AMD64_WORKER_POOL,
8989
),
90+
deb_release_builder(
91+
name="amd64v3-ubuntu-2604-deb-autobake-migration",
92+
image="ubuntu2604v3",
93+
worker_pool=DEFAULT_AMD64_WORKER_POOL,
94+
),
9095
]
9196

9297
## ------------------------------------------------------------------- ##

master-web/templates/home.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
li
7474
| Debian 11, 12, 13 and Sid
7575
li
76-
| Ubuntu 22.04, 24.04, 25.04 and 25.10
76+
| Ubuntu 22.04, 24.04, 25.04, 25.10 and 26.04
7777
li
7878
| Fedora 41 and 42
7979
li

os_info.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,13 @@ ubuntu-2510:
240240
- amd64
241241
- aarch64
242242
type: deb
243+
ubuntu-2604:
244+
image_tag: ubuntu26.04
245+
tags:
246+
- release_packages
247+
arch:
248+
- amd64
249+
- aarch64
250+
- ppc64le
251+
- s390x
252+
type: deb

0 commit comments

Comments
 (0)