From c6384fbdf31f7b0c0e819c25e3ba55b6e3286861 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 25 Jun 2025 11:33:36 +0300 Subject: [PATCH 1/4] MDBF-1060 - F40 is EOL, next branch protection builder is F41 --- constants.py | 2 +- master-protected-branches/master.cfg | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants.py b/constants.py index f907a9107..e8fb74e4d 100644 --- a/constants.py +++ b/constants.py @@ -54,7 +54,7 @@ "amd64-debian-12-deb-autobake", "amd64-debian-11-debug-ps-embedded", "amd64-msan-clang-20", - "amd64-fedora-40", + "amd64-fedora-41", "amd64-ubuntu-2004-debug", "amd64-ubuntu-2204-debug-ps", "amd64-windows", diff --git a/master-protected-branches/master.cfg b/master-protected-branches/master.cfg index 793340086..3953c0356 100644 --- a/master-protected-branches/master.cfg +++ b/master-protected-branches/master.cfg @@ -152,8 +152,8 @@ for w_name in ["hz-bbw"]: addWorker( w_name, i, - "fedora-40", - os.environ["CONTAINER_REGISTRY_URL"] + "fedora40", + "fedora-41", + os.environ["CONTAINER_REGISTRY_URL"] + "fedora41", jobs=jobs, save_packages=True, ) @@ -503,8 +503,8 @@ c["builders"].append( c["builders"].append( util.BuilderConfig( - name="amd64-fedora-40", - workernames=workers["x64-bbw-docker-fedora-40"], + name="amd64-fedora-41", + workernames=workers["x64-bbw-docker-fedora-41"], tags=["Fedora", "quick", "gcc", "protected"], collapseRequests=True, nextBuild=nextBuild, From 050ab1fc6635de293d78e7f4ff592dcc89a23686 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 25 Jun 2025 11:44:01 +0300 Subject: [PATCH 2/4] MDBF-1060 - Fedora 40 is EOL - remove release builders --- .github/workflows/build-fedora-based.yml | 4 ---- constants.py | 2 -- os_info.yaml | 9 --------- 3 files changed, 15 deletions(-) diff --git a/.github/workflows/build-fedora-based.yml b/.github/workflows/build-fedora-based.yml index 4f7ce9990..b44c6ca15 100644 --- a/.github/workflows/build-fedora-based.yml +++ b/.github/workflows/build-fedora-based.yml @@ -26,10 +26,6 @@ jobs: fail-fast: false matrix: include: - - image: fedora:40 - platforms: linux/amd64, linux/arm64/v8 - nogalera: false - - image: fedora:41 platforms: linux/amd64, linux/arm64/v8 nogalera: true diff --git a/constants.py b/constants.py index e8fb74e4d..6d3d77b87 100644 --- a/constants.py +++ b/constants.py @@ -170,7 +170,6 @@ SUPPORTED_PLATFORMS["10.11"] = [ "aarch64-centos-stream10", "aarch64-debian-12", - "aarch64-fedora-40", "aarch64-fedora-41", "aarch64-rhel-10", "aarch64-ubuntu-2404", @@ -178,7 +177,6 @@ "amd64-debian-12", "amd64-debian-12-deb-autobake-migration", "amd64-debian-12-debug-embedded", - "amd64-fedora-40", "amd64-fedora-41", "amd64-opensuse-1506", "amd64-rhel-10", diff --git a/os_info.yaml b/os_info.yaml index b3efe8158..f5952bb72 100644 --- a/os_info.yaml +++ b/os_info.yaml @@ -96,15 +96,6 @@ debian-sid: - ppc64le - x86 type: deb -fedora-40: - image_tag: fedora40 - tags: - - release_packages - version_name: 40 - arch: - - amd64 - - aarch64 - type: rpm fedora-41: image_tag: fedora41 tags: From e4e4a8bfbad23cb33b694b4d48852357902f3de2 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 25 Jun 2025 11:49:59 +0300 Subject: [PATCH 3/4] MDBF-1060 Add Fedora 42 release builders --- .github/workflows/build-fedora-based.yml | 4 ++++ ci_build_images/fedora.Dockerfile | 7 +++++-- constants.py | 2 ++ os_info.yaml | 9 +++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-fedora-based.yml b/.github/workflows/build-fedora-based.yml index b44c6ca15..a0b10a854 100644 --- a/.github/workflows/build-fedora-based.yml +++ b/.github/workflows/build-fedora-based.yml @@ -30,6 +30,10 @@ jobs: platforms: linux/amd64, linux/arm64/v8 nogalera: true + - image: fedora:42 + platforms: linux/amd64, linux/arm64/v8 + nogalera: true + - image: fedora:40 platforms: linux/amd64 tag: fedora40-valgrind diff --git a/ci_build_images/fedora.Dockerfile b/ci_build_images/fedora.Dockerfile index f057dd047..a86c7d727 100644 --- a/ci_build_images/fedora.Dockerfile +++ b/ci_build_images/fedora.Dockerfile @@ -36,8 +36,6 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \ gawk \ gdb \ iproute \ - java-1.8.0-openjdk-devel \ - java-1.8.0-openjdk \ jemalloc-devel \ libaio-devel \ libcurl-devel \ @@ -63,6 +61,11 @@ RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf \ unixODBC-devel \ wget \ which \ + && if [ "$VERSION_ID" = "42" ]; then \ + dnf -y install java-latest-openjdk-devel java-latest-openjdk; \ + else \ + dnf -y install java-1.8.0-openjdk-devel java-1.8.0-openjdk; \ + fi \ && if [ "$(uname -m)" = "x86_64" ]; then dnf -y install libpmem-devel; fi \ && if [ "$INSTALL_VALGRIND" = "true" ]; then dnf -y install valgrind; fi \ && dnf clean all diff --git a/constants.py b/constants.py index 6d3d77b87..91e421a05 100644 --- a/constants.py +++ b/constants.py @@ -171,6 +171,7 @@ "aarch64-centos-stream10", "aarch64-debian-12", "aarch64-fedora-41", + "aarch64-fedora-42", "aarch64-rhel-10", "aarch64-ubuntu-2404", "amd64-centos-stream10", @@ -178,6 +179,7 @@ "amd64-debian-12-deb-autobake-migration", "amd64-debian-12-debug-embedded", "amd64-fedora-41", + "amd64-fedora-42", "amd64-opensuse-1506", "amd64-rhel-10", "amd64-sles-1506", diff --git a/os_info.yaml b/os_info.yaml index f5952bb72..c697fdd7a 100644 --- a/os_info.yaml +++ b/os_info.yaml @@ -105,6 +105,15 @@ fedora-41: - amd64 - aarch64 type: rpm +fedora-42: + image_tag: fedora42 + tags: + - release_packages + version_name: 42 + arch: + - amd64 + - aarch64 + type: rpm openeuler-2403: image_tag: openeuler2403 tags: From befd3349836ccfb6dbf177083da496373c6ce909 Mon Sep 17 00:00:00 2001 From: Razvan-Liviu Varzaru Date: Wed, 25 Jun 2025 11:52:13 +0300 Subject: [PATCH 4/4] MDBF-1060 Upgrade Valgrind builder to Fedora 42 --- .github/workflows/build-fedora-based.yml | 6 +++--- constants.py | 2 +- master-docker-nonstandard/master.cfg | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-fedora-based.yml b/.github/workflows/build-fedora-based.yml index a0b10a854..46f4c56de 100644 --- a/.github/workflows/build-fedora-based.yml +++ b/.github/workflows/build-fedora-based.yml @@ -34,11 +34,11 @@ jobs: platforms: linux/amd64, linux/arm64/v8 nogalera: true - - image: fedora:40 + - image: fedora:42 platforms: linux/amd64 - tag: fedora40-valgrind + tag: fedora42-valgrind install_valgrind: "true" - nogalera: false + nogalera: true uses: ./.github/workflows/bbw_build_container_template.yml with: diff --git a/constants.py b/constants.py index 91e421a05..3378c4aa0 100644 --- a/constants.py +++ b/constants.py @@ -125,7 +125,7 @@ "amd64-debian-11-debug-ps-embedded", "amd64-debian-12-asan-ubsan", "amd64-debian-12-rocksdb", - "amd64-fedora-40-valgrind", + "amd64-fedora-42-valgrind", "amd64-freebsd-14", "amd64-msan-clang-20", "amd64-openeuler-2403", diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg index 2e023bc94..691f9e6a7 100644 --- a/master-docker-nonstandard/master.cfg +++ b/master-docker-nonstandard/master.cfg @@ -266,24 +266,24 @@ for w_name in ["ns-x64-bbw", "apexis-bbw"]: addWorker( "amd-bbw", 1, - "valgrind-fedora-40", - os.environ["CONTAINER_REGISTRY_URL"] + "fedora40-valgrind", + "valgrind-fedora-42", + os.environ["CONTAINER_REGISTRY_URL"] + "fedora42-valgrind", jobs=20, save_packages=False, ) addWorker( "amd-bbw", 2, - "valgrind-fedora-40", - os.environ["CONTAINER_REGISTRY_URL"] + "fedora40-valgrind", + "valgrind-fedora-42", + os.environ["CONTAINER_REGISTRY_URL"] + "fedora42-valgrind", jobs=20, save_packages=False, ) addWorker( "hz-bbw", 6, - "valgrind-fedora-40", - os.environ["CONTAINER_REGISTRY_URL"] + "fedora40-valgrind", + "valgrind-fedora-42", + os.environ["CONTAINER_REGISTRY_URL"] + "fedora42-valgrind", jobs=20, save_packages=False, ) @@ -1304,8 +1304,8 @@ c["builders"].append( c["builders"].append( util.BuilderConfig( - name="amd64-fedora-40-valgrind", - workernames=workers["x64-bbw-docker-valgrind-fedora-40"], + name="amd64-fedora-42-valgrind", + workernames=workers["x64-bbw-docker-valgrind-fedora-42"], tags=["Ubuntu", "quick", "gcc", "valgrind", "experimental"], collapseRequests=True, nextBuild=nextBuild,