From: David Galloway Date: Wed, 27 May 2026 17:00:20 +0000 (-0400) Subject: Clean up references to EOL distros X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14fa74cd2dfada80237fd80687729b75ab4eafd5;p=ceph-build.git Clean up references to EOL distros I didn't bother with the jobs that I'm pretty sure need to be moved to the attic. Signed-off-by: David Galloway --- diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 8af8b2a9f..5dfb912ea 100644 --- a/ceph-build/build/setup_deb +++ b/ceph-build/build/setup_deb @@ -38,7 +38,7 @@ vers=`cat ./dist/version` # like project/ref/ubuntu/jessie/. distro="" case $DIST in - bookworm|bullseye|buster|stretch|jessie|wheezy) + bookworm) distro="debian" ;; *) diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index 5cbb3ad0b..77043fb95 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -12,7 +12,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["bionic", "focal", "jammy", "noble", "centos9"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["jammy", "noble", "centos9"].contains(DIST))) axes: - axis: type: label-expression @@ -29,22 +29,11 @@ type: label-expression name: AVAILABLE_DIST values: - - trusty - - xenial - - bionic - - focal - jammy - noble - - centos7 - centos8 - centos9 - - jessie - - stretch - - buster - - bullseye - bookworm - - precise - - centos6 - axis: type: dynamic name: DIST @@ -66,7 +55,7 @@ regex: (reef|squid|tentacle|umbrella) label: '${{BRANCH}}' - condition-kind: regex-match - regex: (focal|jammy|noble|centos9|buster|bullseye|bookworm) + regex: (jammy|noble|centos9|bookworm) label: '${{DIST}}' on-evaluation-failure: dont-run steps: diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 02251ce99..a88fea0d6 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -17,7 +17,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8", "centos9"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["jammy", "noble", "centos8", "centos9"].contains(DIST))) axes: - axis: type: label-expression @@ -34,18 +34,12 @@ type: label-expression name: AVAILABLE_DIST values: - - trusty - - xenial - - bionic - - focal - jammy - noble - - centos7 - centos8 - centos9 - jessie - precise - - centos6 - leap15 - windows - axis: diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index 65d01287c..56708cfd4 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -22,7 +22,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8", "centos9"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["jammy", "noble", "centos8", "centos9"].contains(DIST))) axes: - axis: type: label-expression @@ -39,16 +39,10 @@ type: label-expression name: AVAILABLE_DIST values: - - trusty - - xenial - - bionic - - focal - jammy - noble - jessie - precise - - centos6 - - centos7 - centos8 - centos9 - leap15 diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml index 6ab0ea285..31b60327f 100644 --- a/ceph-dev-new/config/definitions/ceph-dev-new.yml +++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml @@ -25,7 +25,7 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows" + description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, and windows" default: "noble jammy centos9 windows" - string: diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml index f2e87ba30..0bd6ac546 100644 --- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml +++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml @@ -36,7 +36,7 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, focal, and windows" + description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, and windows" default: "centos9 noble jammy" - string: diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml index 031ed32c8..06e380988 100644 --- a/ceph-dev/config/definitions/ceph-dev.yml +++ b/ceph-dev/config/definitions/ceph-dev.yml @@ -23,8 +23,8 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows" - default: "noble jammy focal bionic centos7 centos8 centos9" + description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, and windows" + default: "noble jammy centos8 centos9" - string: name: ARCHS diff --git a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml index 6f322f2aa..31b7c7b32 100644 --- a/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml +++ b/ceph-iscsi-tox/config/definitions/ceph-iscsi-tox.yml @@ -16,7 +16,7 @@ name: ceph-iscsi-tox description: Runs tox tests for ceph-iscsi on each GitHub PR project-type: freestyle - node: focal && x86_64 + node: jammy && x86_64 block-downstream: false block-upstream: false defaults: global diff --git a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml b/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml index f9044c188..91647411f 100644 --- a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml +++ b/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml @@ -77,7 +77,7 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm, trixie" + description: "A list of distros to build for. Available options are: centos9, noble, jammy, bookworm, trixie" default: "noble jammy centos8 centos9 bookworm trixie" - string: diff --git a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml index ee0039130..8d6e89e19 100644 --- a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml +++ b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml @@ -1,7 +1,7 @@ - job: name: ceph-windows-image-build description: 'Builds the Ceph Windows VM image used in the CI.' - node: x86_64 && focal && libvirt + node: x86_64 && noble && libvirt project-type: freestyle defaults: global concurrent: false diff --git a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml index 0aac9b356..e7dae36a0 100644 --- a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml +++ b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml @@ -1,7 +1,7 @@ - job: name: ceph-windows-installer-build description: 'Builds the Ceph Windows MSI installer.' - node: x86_64 && focal && libvirt + node: x86_64 && noble && libvirt project-type: freestyle defaults: global concurrent: true diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml index d72136f94..f716ae217 100644 --- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml +++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml @@ -3,7 +3,7 @@ project-type: freestyle defaults: global concurrent: true - node: x86_64 && focal && libvirt && windows && gigantic + node: x86_64 && noble && libvirt && windows && gigantic display-name: 'ceph-windows: Pull Requests' quiet-period: 5 block-downstream: false diff --git a/ceph-windows-test/config/definitions/ceph-windows-test.yml b/ceph-windows-test/config/definitions/ceph-windows-test.yml index e810f1c8e..348bc3181 100644 --- a/ceph-windows-test/config/definitions/ceph-windows-test.yml +++ b/ceph-windows-test/config/definitions/ceph-windows-test.yml @@ -1,7 +1,7 @@ - job: name: ceph-windows-test description: 'Runs the unit tests from a Windows build uploaded to Chacra.' - node: x86_64&&focal&&libvirt + node: x86_64&&noble&&libvirt project-type: freestyle defaults: global concurrent: true diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml index a28412bf3..261660457 100644 --- a/ceph/config/definitions/ceph.yml +++ b/ceph/config/definitions/ceph.yml @@ -78,8 +78,8 @@ SECURITY: Builds from BRANCH-release branch in ceph-private.git (private repo)." - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm" - default: "noble jammy focal centos8 centos9 bookworm" + description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, bullseye, bookworm" + default: "noble jammy centos8 centos9 bookworm" - string: name: ARCHS diff --git a/kernel/config/definitions/kernel.yml b/kernel/config/definitions/kernel.yml index 926036b22..4842cdf56 100644 --- a/kernel/config/definitions/kernel.yml +++ b/kernel/config/definitions/kernel.yml @@ -16,8 +16,8 @@ - string: name: DISTROS - description: "A list of distros to build for. Available options are: centos9, noble, jammy and focal" - default: "centos9 focal jammy noble" + description: "A list of distros to build for. Available options are: centos9, noble, and jammy" + default: "centos9 jammy noble" - string: name: ARCHS @@ -60,7 +60,6 @@ If this is checked, then the binaries will be built and pushed to chacra even if name: AVAILABLE_DIST values: - centos9 - - focal - jammy - noble - axis: diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml index 92c645556..5be38355f 100644 --- a/nfs-ganesha/config/definitions/nfs-ganesha.yml +++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml @@ -96,7 +96,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if type: label-expression name: AVAILABLE_DIST values: - - focal + - jammy - axis: type: dynamic name: DIST diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index f1a6e8a14..a13a442b5 100755 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -416,26 +416,6 @@ get_distro_and_target() { DIST=bookworm DISTRO="debian" ;; - bullseye*) - DIST=bullseye - DISTRO="debian" - ;; - buster*) - DIST=buster - DISTRO="debian" - ;; - stretch*) - DIST=stretch - DISTRO="debian" - ;; - jessie*) - DIST=jessie - DISTRO="debian" - ;; - wheezy*) - DIST=wheezy - DISTRO="debian" - ;; noble*) DIST=noble DISTRO="ubuntu" @@ -444,26 +424,6 @@ get_distro_and_target() { DIST=jammy DISTRO="ubuntu" ;; - focal*) - DIST=focal - DISTRO="ubuntu" - ;; - bionic*) - DIST=bionic - DISTRO="ubuntu" - ;; - xenial*) - DIST=xenial - DISTRO="ubuntu" - ;; - precise*) - DIST=precise - DISTRO="ubuntu" - ;; - trusty*) - DIST=trusty - DISTRO="ubuntu" - ;; centos*) source /etc/os-release if [ $VERSION -ge 8 ]; then @@ -548,12 +508,6 @@ setup_pbuilder() { # build. os="debian" - [ "$DIST" = "precise" ] && os="ubuntu" - [ "$DIST" = "saucy" ] && os="ubuntu" - [ "$DIST" = "trusty" ] && os="ubuntu" - [ "$DIST" = "xenial" ] && os="ubuntu" - [ "$DIST" = "bionic" ] && os="ubuntu" - [ "$DIST" = "focal" ] && os="ubuntu" [ "$DIST" = "jammy" ] && os="ubuntu" [ "$DIST" = "noble" ] && os="ubuntu" @@ -798,12 +752,6 @@ setup_pbuilder_for_old_gcc() { # point gcc,g++ to the ones shipped by distro local hookdir=$1 case $DIST in - trusty) - old=4.8;; - xenial) - old=5;; - bionic) - old=8;; focal) old=9;; jammy) @@ -838,26 +786,9 @@ get_bptag() { [ "$dist" = "sid" ] && dver="" [ "$dist" = "trixie" ] && dver="~bpo13+1" [ "$dist" = "bookworm" ] && dver="~bpo12+1" - [ "$dist" = "bullseye" ] && dver="~bpo11+1" - [ "$dist" = "buster" ] && dver="~bpo10+1" - [ "$dist" = "stretch" ] && dver="~bpo90+1" - [ "$dist" = "jessie" ] && dver="~bpo80+1" - [ "$dist" = "wheezy" ] && dver="~bpo70+1" - [ "$dist" = "squeeze" ] && dver="~bpo60+1" - [ "$dist" = "lenny" ] && dver="~bpo50+1" [ "$dist" = "noble" ] && dver="$dist" [ "$dist" = "jammy" ] && dver="$dist" [ "$dist" = "focal" ] && dver="$dist" - [ "$dist" = "bionic" ] && dver="$dist" - [ "$dist" = "xenial" ] && dver="$dist" - [ "$dist" = "trusty" ] && dver="$dist" - [ "$dist" = "saucy" ] && dver="$dist" - [ "$dist" = "precise" ] && dver="$dist" - [ "$dist" = "oneiric" ] && dver="$dist" - [ "$dist" = "natty" ] && dver="$dist" - [ "$dist" = "maverick" ] && dver="$dist" - [ "$dist" = "lucid" ] && dver="$dist" - [ "$dist" = "karmic" ] && dver="$dist" echo $dver } diff --git a/scripts/sync-pull b/scripts/sync-pull index 42ffe22ac..7eca6703c 100755 --- a/scripts/sync-pull +++ b/scripts/sync-pull @@ -16,7 +16,7 @@ echo "********************************************" if [[ "$project" == "ceph" ]] ; then # This ugly loop checks all possible DEB combinations to see which repo has the most packages since that's likely the repo you want to sync. current_highest_count=0 - for combo in debian/trixie debian/bookworm debian/bullseye ubuntu/bionic ubuntu/focal ubuntu/jammy ubuntu/noble; do + for combo in debian/trixie debian/bookworm ubuntu/jammy ubuntu/noble; do combo_count=$(curl -fs https://chacra.ceph.com/r/$project/$release/$sha1/${combo}/flavors/default/pool/main/c/ceph/ | wc -l || /bin/true) if [[ ${PIPESTATUS[0]} -eq 22 ]] ; then echo "$combo packages not found, skipping" diff --git a/wnbd-build/config/definitions/wnbd-build.yml b/wnbd-build/config/definitions/wnbd-build.yml index 7f96fb649..4b4158777 100644 --- a/wnbd-build/config/definitions/wnbd-build.yml +++ b/wnbd-build/config/definitions/wnbd-build.yml @@ -1,7 +1,7 @@ - job: name: wnbd-build description: 'Builds the Windows Network Block Device (WNBD) project.' - node: x86_64 && focal && libvirt + node: x86_64 && noble && libvirt project-type: freestyle defaults: global concurrent: true