From: David Galloway <dgallowa@redhat.com>
Date: Mon, 16 Mar 2020 18:27:38 +0000 (-0400)
Subject: ceph-release-rpm: Update for EL8 compatibility
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c846bf4d092247c949470c5806012387b1c70c5;p=ceph-build.git

ceph-release-rpm: Update for EL8 compatibility

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index c46778788..d8e579dce 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -31,6 +31,10 @@ if [ "$target" = "centos7" ] ; then
     target=el7
     chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/7"
 fi
+if [ "$target" = "centos8" ] ; then
+    target=el8
+    chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/8"
+fi
 if [ "$target" = "sles11sp2" ] ; then
     target=sles11
     chacra_baseurl="ceph-release/${chacra_ref}/HEAD/sles/11"
@@ -48,6 +52,9 @@ cat <<EOF > ${BUILDAREA}/SPECS/ceph-release.spec
 %if 0%{?centos} == 7
 %define dist .el7
 %endif
+%if 0%{?centos} == 8
+%define dist .el8
+%endif
 
 
 Name:           ceph-release
diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
index ba42cb3ec..32ca9745e 100644
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -38,6 +38,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           values:
             - centos6
             - centos7
+            - centos8
 
     builders:
       - shell: