From: David Galloway <dgallowa@redhat.com>
Date: Thu, 9 Jul 2020 20:31:08 +0000 (-0400)
Subject: ceph-release-rpm: Drop centos6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e8ea8fb1e3c1288a0c360680877fdfd135dd38d;p=ceph-build.git

ceph-release-rpm: Drop centos6

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

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index dab33f19..6f672000 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -23,10 +23,6 @@ make_chacractl_config
 [ "$TEST" = true ] && chacra_ref="test" || chacra_ref="${RELEASE}"
 
 target=$DIST
-if [ "$target" = "centos6" ] ; then
-    target=el6
-    chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/6"
-fi
 if [ "$target" = "centos7" ] ; then
     target=el7
     chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/7"
diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
index 32ca9745..c46c772c 100644
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -9,7 +9,7 @@
     parameters:
       - string:
           name: RELEASE
-          default: firefly
+          default: pacific
 
       - bool:
           name: TEST
@@ -36,7 +36,6 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           type: label-expression
           name: DIST
           values:
-            - centos6
             - centos7
             - centos8