From 40dc69f95877d3f103380c668ced1ba544344fea Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 17 Dec 2019 15:32:21 -0500
Subject: [PATCH] ceph-iscsi: add centos8 distro for dev builds

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 ceph-iscsi/build/build_rpm                   | 2 +-
 ceph-iscsi/config/definitions/ceph-iscsi.yml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ceph-iscsi/build/build_rpm b/ceph-iscsi/build/build_rpm
index 6f80dc5d..7cac8038 100644
--- a/ceph-iscsi/build/build_rpm
+++ b/ceph-iscsi/build/build_rpm
@@ -52,7 +52,7 @@ SRPM=$(readlink -f $WORKSPACE/dist/SRPMS/*.src.rpm)
 ## Build the binaries with mock
 echo "Building RPMs"
 sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --scrub=all
-sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
+sudo mock --verbose -r ${MOCK_TARGET}-${RELEASE}-${ARCH} --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
 
 ## Upload the created RPMs to chacra
 chacra_endpoint="${PROJECT}/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"
diff --git a/ceph-iscsi/config/definitions/ceph-iscsi.yml b/ceph-iscsi/config/definitions/ceph-iscsi.yml
index 2ee2bfb1..85d536c3 100644
--- a/ceph-iscsi/config/definitions/ceph-iscsi.yml
+++ b/ceph-iscsi/config/definitions/ceph-iscsi.yml
@@ -15,7 +15,7 @@
       - string:
           name: DISTROS
           description: "A list of distros to build for. Available options are: centos7"
-          default: "centos7"
+          default: "centos7 centos8"
 
       - string:
           name: ARCHS
@@ -35,7 +35,9 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           default: "/tmp/"
 
     execution-strategy:
-       combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7")))
+       combination-filter: |
+         DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
+         (ARCH == "x86_64" || (ARCH == "arm64" && ["centos7", "centos8"].contains(DIST)))
     axes:
       - axis:
           type: label-expression
@@ -52,6 +54,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           name: AVAILABLE_DIST
           values:
             - centos7
+            - centos8
       - axis:
           type: dynamic
           name: DIST
-- 
2.39.5