diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 604e804ad..42c12462c 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -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 ``` diff --git a/.github/workflows/bbw_build_container_template.yml b/.github/workflows/bbw_build_container_template.yml index ae666c78d..c442c6169 100644 --- a/.github/workflows/bbw_build_container_template.yml +++ b/.github/workflows/bbw_build_container_template.yml @@ -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' }} diff --git a/.github/workflows/build-debian-based.yml b/.github/workflows/build-debian-based.yml index fa81b82df..0e6676a7d 100644 --- a/.github/workflows/build-debian-based.yml +++ b/.github/workflows/build-debian-based.yml @@ -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 @@ -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 @@ -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' }} @@ -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 diff --git a/.github/workflows/build-debian.aocc-based.yml b/.github/workflows/build-debian.aocc-based.yml index 526b423bf..1405e4e1f 100644 --- a/.github/workflows/build-debian.aocc-based.yml +++ b/.github/workflows/build-debian.aocc-based.yml @@ -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 diff --git a/.github/workflows/build-fedora-based.yml b/.github/workflows/build-fedora-based.yml index f6f498830..fc4d3d325 100644 --- a/.github/workflows/build-fedora-based.yml +++ b/.github/workflows/build-fedora-based.yml @@ -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 diff --git a/.github/workflows/build-srpm.yml b/.github/workflows/build-srpm.yml index 9a2e7376e..6fbb4182c 100644 --- a/.github/workflows/build-srpm.yml +++ b/.github/workflows/build-srpm.yml @@ -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 diff --git a/ci_build_images/README.md b/ci_build_images/README.md index 12caac93a..90612d5df 100644 --- a/ci_build_images/README.md +++ b/ci_build_images/README.md @@ -10,7 +10,7 @@ An image's Dockerfile is a concatenation of the files here: a base for its distr | --- | --- | --- | | `-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. diff --git a/ci_build_images/msan.fragment.Dockerfile b/ci_build_images/msan.fragment.Dockerfile index 4ca732074..a9ec11099 100644 --- a/ci_build_images/msan.fragment.Dockerfile +++ b/ci_build_images/msan.fragment.Dockerfile @@ -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 \ diff --git a/ci_build_images/srpm.Dockerfile b/ci_build_images/srpm.Dockerfile index a9f276788..53df80cd2 100644 --- a/ci_build_images/srpm.Dockerfile +++ b/ci_build_images/srpm.Dockerfile @@ -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; \ diff --git a/configuration/builders/definitions/connectors/conc.py b/configuration/builders/definitions/connectors/conc.py index 704ee9ec0..2c790fede 100644 --- a/configuration/builders/definitions/connectors/conc.py +++ b/configuration/builders/definitions/connectors/conc.py @@ -125,6 +125,7 @@ def generate_bintar_sqs( for ops, version in [ ("fedora", "43"), ("fedora", "44"), + ("fedora", "45"), ("sles", "1507"), ("sles", "1600"), ("rhel", "8"), @@ -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"), diff --git a/configuration/builders/definitions/connectors/concpp.py b/configuration/builders/definitions/connectors/concpp.py index 117427cba..303ae1c6c 100644 --- a/configuration/builders/definitions/connectors/concpp.py +++ b/configuration/builders/definitions/connectors/concpp.py @@ -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"), @@ -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"), diff --git a/configuration/builders/definitions/connectors/conodbc.py b/configuration/builders/definitions/connectors/conodbc.py index adb37d4c0..3bb2771c9 100644 --- a/configuration/builders/definitions/connectors/conodbc.py +++ b/configuration/builders/definitions/connectors/conodbc.py @@ -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"), @@ -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"), diff --git a/constants.py b/constants.py index df16edddb..c4fa12980 100644 --- a/constants.py +++ b/constants.py @@ -48,7 +48,7 @@ # 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", @@ -56,7 +56,7 @@ "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", @@ -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", @@ -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", @@ -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", @@ -165,7 +162,7 @@ ] SUPPORTED_PLATFORMS["10.10"] = [ - "amd64-debian-11-aocc", + "amd64-debian-12-aocc", ] SUPPORTED_PLATFORMS["10.10"] += SUPPORTED_PLATFORMS["10.9"] @@ -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", @@ -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() diff --git a/docs/server-builders.md b/docs/server-builders.md index dc4b6d64e..607b454ba 100644 --- a/docs/server-builders.md +++ b/docs/server-builders.md @@ -10,8 +10,8 @@ push or pull request on MariaDB/server │ source tarball saved at // ├─ 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 diff --git a/master-config.yaml-sample b/master-config.yaml-sample index 7ec9eaee4..a7fd1d36d 100644 --- a/master-config.yaml-sample +++ b/master-config.yaml-sample @@ -1,6 +1,5 @@ builders: - aarch64-centos-stream9 -- aarch64-debian-11 - aarch64-debian-12 - aarch64-debian-sid - aarch64-rhel-8 diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg index 8ca3feca6..7f0f3a60d 100644 --- a/master-docker-nonstandard/master.cfg +++ b/master-docker-nonstandard/master.cfg @@ -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, ) @@ -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, diff --git a/master-protected-branches/README.md b/master-protected-branches/README.md index c2c54fbbf..1a628c140 100644 --- a/master-protected-branches/README.md +++ b/master-protected-branches/README.md @@ -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). diff --git a/master-protected-branches/master.cfg b/master-protected-branches/master.cfg index 5218dacd2..45f55254f 100644 --- a/master-protected-branches/master.cfg +++ b/master-protected-branches/master.cfg @@ -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, ) @@ -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, ) @@ -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, @@ -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, diff --git a/master-web/templates/home.jade b/master-web/templates/home.jade index e6082dff0..a1e0dc417 100644 --- a/master-web/templates/home.jade +++ b/master-web/templates/home.jade @@ -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 diff --git a/os_info.yaml b/os_info.yaml index c77c0e478..cb23439a0 100644 --- a/os_info.yaml +++ b/os_info.yaml @@ -48,14 +48,6 @@ centos-stream10: - aarch64 - ppc64le type: rpm -debian-11: - image_tag: debian11 - tags: - - release_packages - arch: - - amd64 - - aarch64 - type: deb debian-12: image_tag: debian12 tags: @@ -103,6 +95,14 @@ fedora-44: - amd64 - aarch64 type: rpm +fedora-45: + image_tag: fedora45 + tags: + - release_packages + arch: + - amd64 + - aarch64 + type: rpm openeuler-2403: image_tag: openeuler2403 tags: @@ -227,3 +227,11 @@ ubuntu-2604: - ppc64le - s390x type: deb +ubuntu-2610: + image_tag: ubuntu26.10 + tags: + - release_packages + arch: + - amd64 + - aarch64 + type: deb