Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ An item should be added under `matrix/include`. For example:
```
matrix:
include:
- image: debian:11
- image: debian:13
platforms: linux/amd64, linux/arm64/v8
branch: 10.11
branch: 11.8
nogalera: false
```

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/bbw_build_container_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,16 @@ jobs:
run: |
docker run -i -v $(pwd):/mnt -w /mnt ghcr.io/hadolint/hadolint:latest hadolint /mnt/Dockerfile

- name: Install qemu-user-static
- name: Install qemu user emulation
if: ${{ env.MAIN_BRANCH == 'false' }}
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
# Ubuntu 26.04 ships the static binaries in qemu-user
if apt-cache policy qemu-user-static | grep -q 'Candidate: [0-9]'; then
sudo apt-get install -y qemu-user-static
else
sudo apt-get install -y qemu-user qemu-user-binfmt
fi

- name: Build image
if: ${{ env.MAIN_BRANCH == 'false' }}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/build-debian-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ jobs:
fail-fast: false
matrix:
include:
- image: debian:11
platforms: linux/amd64, linux/arm64/v8
branch: 10.11
nogalera: false

- image: debian:12
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le
branch: 10.11
Expand Down Expand Up @@ -92,6 +87,7 @@ jobs:
platforms: linux/amd64, linux/arm64/v8, linux/ppc64le, linux/s390x
branch: 11.8
nogalera: false
runner: ubuntu-26.04

- image: ubuntu:26.04
tag: ubuntu26.04-amd64v3
Expand All @@ -100,6 +96,12 @@ jobs:
nogalera: false
arch_variant: amd64v3

- image: ubuntu:26.10
platforms: linux/amd64, linux/arm64/v8
branch: 11.8
nogalera: true
runner: ubuntu-26.04

uses: ./.github/workflows/bbw_build_container_template.yml
with:
dockerfile: ${{ matrix.dockerfile || 'debian.Dockerfile' }}
Expand All @@ -111,5 +113,5 @@ jobs:
arch_variant: ${{ matrix.arch_variant }}
is_scheduled_event: ${{ inputs.is_scheduled_event || false }}
deploy_on_schedule: ${{ matrix.deploy_on_schedule || false }}
runner: 'ubuntu-24.04'
runner: ${{ matrix.runner || 'ubuntu-24.04' }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/build-debian.aocc-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
fail-fast: false
matrix:
include:
- image: debian:11
- image: debian:12
platforms: linux/amd64
branch: 10.11
tag: debian11-aocc
tag: debian12-aocc
uses: ./.github/workflows/bbw_build_container_template.yml
with:
dockerfile: debian.Dockerfile aocc.Dockerfile
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-fedora-based.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
platforms: linux/amd64, linux/arm64/v8
nogalera: True

- image: fedora:45
platforms: linux/amd64, linux/arm64/v8
nogalera: True

- image: fedora:44
platforms: linux/amd64
tag: fedora44-valgrind
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-srpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
platforms: linux/amd64, linux/arm64/v8

- dockerfile: srpm.Dockerfile
image: registry.access.redhat.com/ubi7
tag: rhel7-srpm
platforms: linux/amd64
image: fedora:45
tag: fedora45-srpm
platforms: linux/amd64, linux/arm64/v8

- dockerfile: srpm.Dockerfile
image: registry.access.redhat.com/ubi8
Expand Down
2 changes: 1 addition & 1 deletion ci_build_images/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ An image's Dockerfile is a concatenation of the files here: a base for its distr
| --- | --- | --- |
| `<os>-srpm` | `srpm.Dockerfile`, `build-srpm.yml` | Rebuilding the server or a connector from its `.src.rpm`. They are kept close to the bare distribution, to check that the source package declares all its build dependencies. |
| `debian13-msan-clang-22` | `msan.fragment.Dockerfile`, `msan.instrumentedlibs.sh` | Builds with clang and MSAN, ASAN or UBSAN; holds the clang toolchain and libraries built with MSAN |
| `debian11-aocc`, `ubuntu22.04-jepsen-mariadb`, `almalinux8-bintar` | `aocc.Dockerfile`, `jepsen-mariadb.Dockerfile`, `bintar.Dockerfile` | The `-aocc`, Jepsen and `-bintar` builders |
| `debian12-aocc`, `ubuntu22.04-jepsen-mariadb`, `almalinux8-bintar` | `aocc.Dockerfile`, `jepsen-mariadb.Dockerfile`, `bintar.Dockerfile` | The `-aocc`, Jepsen and `-bintar` builders |

The images install `galera-4` from the Galera packages built by [master-galera](../master-galera/README.md#galera-in-the-servers-build-images), so the server builders can run the Galera suites. Use `nogalera: true` for a platform that has no Galera packages yet.

Expand Down
2 changes: 0 additions & 2 deletions ci_build_images/msan.fragment.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ ENV CMAKE_GENERATOR=Ninja
RUN . /etc/os-release \
&& if [ "${VERSION_CODENAME}" = "trixie" ]; then \
apt-get install --no-install-recommends -y libcapnp-1.1.0 ninja-build; \
elif [ "${VERSION_CODENAME}" = "bullseye" ]; then \
apt-get install --no-install-recommends -y libcapnp-0.7.0 ninja-build; \
else \
apt-get install --no-install-recommends -y libcapnp-0.9.2 ninja-build; \
fi \
Expand Down
13 changes: 0 additions & 13 deletions ci_build_images/srpm.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@ RUN source /etc/os-release \
&& zypper -n install rpm-build wget which sudo gcc-c++ ccache \
&& zypper clean; \
;; \
rhel:7*) \
yum -y upgrade \
&& rpm -ivh https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm \
&& yum -y install rpm-build \
yum-utils \
wget \
which \
perl-generators \
sudo \
gcc-c++ \
ccache \
&& yum clean all; \
;; \
*) \
echo "Unsupported base image: $BASE_IMAGE"; \
exit 1; \
Expand Down
2 changes: 1 addition & 1 deletion configuration/builders/definitions/connectors/conc.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ def generate_bintar_sqs(
for ops, version in [
("fedora", "43"),
("fedora", "44"),
("fedora", "45"),
("sles", "1507"),
("sles", "1600"),
("rhel", "8"),
Expand All @@ -141,7 +142,6 @@ def generate_bintar_sqs(
RELEASE_BUILDERS_BY_ARCH[arch].append(builder)

for ops, version in [
("debian", "11"),
("debian", "12"),
("debian", "13"),
("ubuntu", "22.04"),
Expand Down
4 changes: 2 additions & 2 deletions configuration/builders/definitions/connectors/concpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,9 @@ def generate_deb_release_sq(ops, version):
RELEASE_BUILDERS_BY_ARCH = {"amd64": [], "aarch64": []}
for arch in ["amd64", "aarch64"]:
for ops, version in [
("fedora", "42"),
("fedora", "43"),
("fedora", "44"),
("fedora", "45"),
("sles", "1507"),
("sles", "1600"),
("rhel", "8"),
Expand All @@ -241,7 +242,6 @@ def generate_deb_release_sq(ops, version):
RELEASE_BUILDERS_BY_ARCH[arch].append(builder)

for ops, version in [
("debian", "11"),
("debian", "12"),
("debian", "13"),
("ubuntu", "22.04"),
Expand Down
3 changes: 2 additions & 1 deletion configuration/builders/definitions/connectors/conodbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ def generate_deb_release_sq(ops, version):
for arch in ["amd64", "aarch64"]:
for ops, version in [
("fedora", "43"),
("fedora", "44"),
("fedora", "45"),
("sles", "1507"),
("sles", "1600"),
("rhel", "8"),
Expand All @@ -245,7 +247,6 @@ def generate_deb_release_sq(ops, version):
RELEASE_BUILDERS_BY_ARCH[arch].append(builder)

for ops, version in [
("debian", "11"),
("debian", "12"),
("debian", "13"),
("ubuntu", "22.04"),
Expand Down
18 changes: 11 additions & 7 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
# Defines what builders report status to GitHub
GITHUB_STATUS_BUILDERS = [
"aarch64-macos-compile-only",
"aarch64-debian-11",
"aarch64-debian-12",
"amd64-compile-only-minimal",
"amd64-compile-only-nopart-debug",
"amd64-compile-only-noperf_schema",
"amd64-compile-only-without-server",
"amd64-debian-12",
"amd64-debian-12-debug-embedded",
"amd64-debian-12-deb-autobake",
"amd64-debian-11-debug-ps-embedded",
"amd64-debian-12-debug-ps-embedded",
"amd64-msan-clang-22",
"amd64-fedora-43",
"amd64-ubuntu-2204-debug",
Expand All @@ -79,7 +79,7 @@
BUILDERS_DOCKERLIBRARY = ["amd64-rhel8-dockerlibrary"]

BUILDERS_GALERA_MTR = [
"aarch64-debian-12",
"aarch64-debian-13",
"s390x-ubuntu-2204",
"ppc64le-ubuntu-2204",
"amd64-freebsd-14",
Expand Down Expand Up @@ -115,7 +115,6 @@
SUPPORTED_PLATFORMS = {}
SUPPORTED_PLATFORMS["10.9"] = [
"aarch64-centos-stream9",
"aarch64-debian-11",
"aarch64-macos",
"aarch64-macos-compile-only",
"aarch64-openeuler-2403",
Expand All @@ -129,8 +128,6 @@
"amd64-compile-only-nopart-debug",
"amd64-compile-only-noperf_schema",
"amd64-compile-only-without-server",
"amd64-debian-11",
"amd64-debian-11-debug-ps-embedded",
"amd64-debian-12-rocksdb",
"amd64-fedora-44-valgrind",
"amd64-freebsd-14",
Expand Down Expand Up @@ -165,7 +162,7 @@
]

SUPPORTED_PLATFORMS["10.10"] = [
"amd64-debian-11-aocc",
"amd64-debian-12-aocc",
]
SUPPORTED_PLATFORMS["10.10"] += SUPPORTED_PLATFORMS["10.9"]

Expand All @@ -178,6 +175,7 @@
"amd64-debian-12",
"amd64-debian-12-deb-autobake-migration",
"amd64-debian-12-debug-embedded",
"amd64-debian-12-debug-ps-embedded",
"amd64-rhel-10",
"amd64-ubasan-clang-22",
"amd64-ubasan-clang-22-debug",
Expand Down Expand Up @@ -228,11 +226,17 @@
"amd64v3-ubuntu-2604-deb-autobake-migration",
"ppc64le-ubuntu-2604",
"s390x-ubuntu-2604",
"aarch64-ubuntu-2610",
"amd64-ubuntu-2610",
]
SUPPORTED_PLATFORMS["12.0"] = SUPPORTED_PLATFORMS["11.8"].copy()
SUPPORTED_PLATFORMS["12.1"] = SUPPORTED_PLATFORMS["12.0"].copy()
SUPPORTED_PLATFORMS["12.2"] = SUPPORTED_PLATFORMS["12.1"].copy()
SUPPORTED_PLATFORMS["12.3"] = SUPPORTED_PLATFORMS["12.2"].copy()
SUPPORTED_PLATFORMS["12.3"] += [
"aarch64-fedora-45",
"amd64-fedora-45",
]
SUPPORTED_PLATFORMS["13.0"] = SUPPORTED_PLATFORMS["12.3"].copy()
SUPPORTED_PLATFORMS["13.1"] = SUPPORTED_PLATFORMS["13.0"].copy()
SUPPORTED_PLATFORMS["13.2"] = SUPPORTED_PLATFORMS["13.1"].copy()
Expand Down
4 changes: 2 additions & 2 deletions docs/server-builders.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ push or pull request on MariaDB/server
│ source tarball saved at <ARTIFACTS_URL>/<tarbuildnum>/
├─ s_protected_branches: GITHUB_STATUS_BUILDERS in SUPPORTED_PLATFORMS[version]
└─ s_upstream_all: the rest of SUPPORTED_PLATFORMS[version], on any master
└─ e.g. aarch64-debian-12 autogen: RelWithDebInfo build, default MTR suites
└─ aarch64-debian-12-deb-autobake autogen: release packages, no tests
└─ e.g. aarch64-debian-13 autogen: RelWithDebInfo build, default MTR suites
└─ aarch64-debian-13-deb-autobake autogen: release packages, no tests
├─ ...-install master-libvirt
├─ ...-minor-upgrade-all, -major-upgrade, -distro-upgrade, ...
└─ Docker Library tests master-nonlatent
Expand Down
1 change: 0 additions & 1 deletion master-config.yaml-sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
builders:
- aarch64-centos-stream9
- aarch64-debian-11
- aarch64-debian-12
- aarch64-debian-sid
- aarch64-rhel-8
Expand Down
8 changes: 4 additions & 4 deletions master-docker-nonstandard/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ for w_name, w_ids in x64_bbw_docker.items():
addWorker(
w_name,
w["id"],
"aocc-debian-11",
os.environ["CONTAINER_REGISTRY_URL"] + "debian11-aocc",
"aocc-debian-12",
os.environ["CONTAINER_REGISTRY_URL"] + "debian12-aocc",
jobs=w["jobs"],
save_packages=False,
)
Expand Down Expand Up @@ -797,8 +797,8 @@ c["builders"] = []

c["builders"].append(
util.BuilderConfig(
name="amd64-debian-11-aocc",
workernames=workers["x64-bbw-docker-aocc-debian-11"],
name="amd64-debian-12-aocc",
workernames=workers["x64-bbw-docker-aocc-debian-12"],
tags=["Ubuntu", "quick", "aocc"],
collapseRequests=True,
nextBuild=nextBuild,
Expand Down
2 changes: 1 addition & 1 deletion master-protected-branches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Every master runs a `GitHubStatusPush` service ([master_common.py](../master_com
A builder in `GITHUB_STATUS_BUILDERS`:

- is started by the `s_protected_branches` scheduler instead of `s_upstream_all`, and still has to be in `SUPPORTED_PLATFORMS` for the version;
- isn't generated by the autogen masters, even if its platform is in `os_info.yaml`, so it must be defined on another master (here, for `amd64-debian-12`, `aarch64-debian-11` and `amd64-fedora-43`).
- isn't generated by the autogen masters, even if its platform is in `os_info.yaml`, so it must be defined on another master (here, for `amd64-debian-12`, `aarch64-debian-12` and `amd64-fedora-43`).

A required status has to arrive soon, so these builders must be fast. The release builders on master-migration are too slow for this; see [Release builders](../master-migration/README.md#release-builders).

Expand Down
16 changes: 8 additions & 8 deletions master-protected-branches/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ for w_name in ["hz-bbw"]:
addWorker(
w_name,
i,
"debian-11-debug-ps-embed",
os.environ["CONTAINER_REGISTRY_URL"] + "debian11",
"debian-12-debug-ps-embed",
os.environ["CONTAINER_REGISTRY_URL"] + "debian12",
jobs=14,
save_packages=False,
)
Expand Down Expand Up @@ -191,8 +191,8 @@ for w_name in ["aarch64-bbw"]:
addWorker(
w_name,
i,
"debian-11",
os.environ["CONTAINER_REGISTRY_URL"] + "debian11",
"debian-12",
os.environ["CONTAINER_REGISTRY_URL"] + "debian12",
jobs=jobs,
save_packages=True,
)
Expand Down Expand Up @@ -469,8 +469,8 @@ c["builders"].append(

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

c["builders"].append(
util.BuilderConfig(
name="aarch64-debian-11",
workernames=workers["aarch64-bbw-docker-debian-11"],
name="aarch64-debian-12",
workernames=workers["aarch64-bbw-docker-debian-12"],
tags=["Debian", "quick", "gcc", "protected"],
collapseRequests=True,
nextBuild=nextBuild,
Expand Down
6 changes: 3 additions & 3 deletions master-web/templates/home.jade
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@
| and operating systems:
ul
li
| Debian 11, 12, 13 and Sid
| Debian 12, 13 and Sid
li
| Ubuntu 22.04, 24.04, and 26.04
| Ubuntu 22.04, 24.04, 26.04 and 26.10
li
| Fedora 43 and 44
| Fedora 43, 44 and 45
li
| CentOS Stream 9 and 10
li
Expand Down
Loading