From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 18 Dec 2019 00:30:32 +0000 (-0500)
Subject: tcmu-runner: add centos8 to the available distros
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1461%2Fhead;p=ceph-build.git

tcmu-runner: add centos8 to the available distros

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/tcmu-runner/build/build_rpm b/tcmu-runner/build/build_rpm
index 45ba66c9..2940bf1f 100644
--- a/tcmu-runner/build/build_rpm
+++ b/tcmu-runner/build/build_rpm
@@ -83,7 +83,7 @@ cat tcmu-runner.cfg
 ## Build the binaries with mock
 echo "Building RPMs"
 sudo mock --verbose -r tcmu-runner.cfg --scrub=all
-sudo mock --verbose -r tcmu-runner.cfg --define "dist .el7" --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
+sudo mock --verbose -r tcmu-runner.cfg --resultdir=$WORKSPACE/dist/RPMS/ ${SRPM} || ( tail -n +1 $WORKSPACE/dist/RPMS/{root,build}.log && exit 1 )
 
 ## Upload the created RPMs to chacra
 chacra_endpoint="tcmu-runner/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${RELEASE}"
diff --git a/tcmu-runner/config/definitions/tcmu-runner.yml b/tcmu-runner/config/definitions/tcmu-runner.yml
index 1e43c8a9..65383bbc 100644
--- a/tcmu-runner/config/definitions/tcmu-runner.yml
+++ b/tcmu-runner/config/definitions/tcmu-runner.yml
@@ -24,8 +24,8 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: xenial, centos7, centos6, trusty-pbuilder, precise, wheezy, and jessie"
-          default: "centos7"
+          description: "A list of distros to build for. Available options are: centos7, centos8"
+          default: "centos7 centos8"
 
       - string:
           name: ARCHS
@@ -45,7 +45,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
@@ -62,6 +64,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