ceph-iscsi-stable: make centos9 work

also remove centos7 builds

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/ceph-iscsi-stable/build/setup b/ceph-iscsi-stable/build/setup
index bc3de22dd035ea6bd3a7e0fe97ae129ba21776d9..15ce1119953db8b248db670e0ae8b400e92892e7 100644 (file)
--- a/ceph-iscsi-stable/build/setup
+++ b/ceph-iscsi-stable/build/setup
@@ -18,10 +18,8 @@ set -ex
 cd $WORKSPACE
 
 # This will set the DISTRO and MOCK_TARGET variables.
-#get_distro_and_target
-# I could not get that function to work so I'm hardcoding these vars.
-DISTRO="centos"
-MOCK_TARGET="epel"
+get_distro_and_target
+echo "DISTRO: $DISTRO  MOCK_TARGET: $MOCK_TARGET"
 
 # Make sure the dist directory is clean
 rm -rf dist

diff --git a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
index 740f295a09b976b484290aa4f629b80a70504b12..e55ef4c47fe732daec3476785ec15cff69453dcb 100644 (file)
--- a/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
+++ b/ceph-iscsi-stable/config/definitions/ceph-iscsi-stable.yml
@@ -31,7 +31,7 @@
       - string:
           name: CEPH_ISCSI_BRANCH
           description: "The git branch (or tag) to build"
-          default: "3.5"
+          default: "3.6"
 
       - string:
           name: CEPH_ISCSI_TOOLS_BRANCH
@@ -40,8 +40,8 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos7 centos8"
-          default: "centos7 centos8"
+          description: "A list of distros to build for. Available options are: centos8 centos9"
+          default: "centos8 centos9"
 
       - string:
           name: ARCHS
@@ -70,7 +70,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
     execution-strategy:
        combination-filter: |
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
-         (ARCH == "x86_64" || (ARCH == "arm64" && ["centos7", "centos8"].contains(DIST)))
+         (ARCH == "x86_64" || (ARCH == "arm64" && ["centos8"].contains(DIST)))
     axes:
       - axis:
           type: label-expression
@@ -86,8 +86,8 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           type: label-expression
           name: AVAILABLE_DIST
           values:
-            - centos7
             - centos8
+            - centos9
       - axis:
           type: dynamic
           name: DIST