]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-dev-pipeline: Don't reject rocky 2408/head
authorZack Cerza <zack@cerza.org>
Wed, 23 Jul 2025 00:16:34 +0000 (18:16 -0600)
committerZack Cerza <zack@cerza.org>
Wed, 23 Jul 2025 00:16:34 +0000 (18:16 -0600)
Signed-off-by: Zack Cerza <zack@cerza.org>
ceph-dev-pipeline/build/Jenkinsfile

index ebf057560e40c5a164a66e40389e862fd174d159..7bbd8cb4b798448c535d2a96669b909c34fc9a7b 100644 (file)
@@ -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"