From 4852f688da339fe9cf58b1bdf7102bcaba077b3b Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 22 Jul 2025 18:16:34 -0600 Subject: [PATCH] ceph-dev-pipeline: Don't reject rocky Signed-off-by: Zack Cerza --- ceph-dev-pipeline/build/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile index ebf05756..7bbd8cb4 100644 --- a/ceph-dev-pipeline/build/Jenkinsfile +++ b/ceph-dev-pipeline/build/Jenkinsfile @@ -19,7 +19,7 @@ def get_os_info(dist) { "version_name": dist, "pkg_type": "NONE", ] - def matcher = dist =~ /^(centos|rhel|fedora)(\d+)/ + def matcher = dist =~ /^(centos|rhel|rocky|fedora)(\d+)/ if ( matcher.find() ) { os.name = matcher.group(1) os.version = os.version_name = matcher.group(2) @@ -437,7 +437,7 @@ pipeline { echo "DEB_BUILD_PROFILES${DEB_BUILD_PROFILES}" >> .env ''' bwc_command = "${bwc_command} -e debs" - } else if ( env.DIST =~ /^(centos|rhel|fedora).*/ ) { + } else if ( env.DIST =~ /^(centos|rhel|rocky|fedora).*/ ) { def rpmbuild_args = "" if ( env.SCCACHE == "true" ) rpmbuild_args += " -R--with=sccache" if ( env.DWZ == "false" ) rpmbuild_args += " -R--without=dwz" @@ -465,7 +465,7 @@ pipeline { ${bwc_command_base} -e custom -- "dpkg-deb --fsys-tarfile /ceph/debs/*/pool/main/c/ceph/cephadm_${VERSION}*.deb | tar -x -f - --strip-components=3 ./usr/sbin/cephadm" ln ./cephadm ../../ """ - } else if ( env.DIST =~ /^(centos|rhel|fedora).*/ ) { + } else if ( env.DIST =~ /^(centos|rhel|rocky|fedora).*/ ) { sh """#!/bin/bash -ex cd dist/ceph ${bwc_command_base} -e custom -- "rpm2cpio /ceph/rpmbuild/RPMS/noarch/cephadm-*.rpm | cpio -i --to-stdout *sbin/cephadm > cephadm" -- 2.39.5