ceph{-,dev-,dev-new-}build: enable testing repo for arm64

the devtoolset-7 for aarch64 is not offered by centos-sclo-rh repo, but
at least centos-sclo-rh-testing has devtoolset-6.

see https://github.com/sclorg/centos-release-scl
see https://buildlogs.centos.org/centos/7/sclo/aarch64/rh/

Fixes: http://tracker.ceph.com/issues/22301
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 8d2d0402aa568ccd3226bc85acdee0deff55e888..d5e50fb6db3f5a155f11a78d780ea6879549bf91 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -30,7 +30,13 @@ cd ceph-*
 pwd
 
 $SUDO yum install -y yum-utils
-$SUDO yum install -y centos-release-scl
+if [ "$ARCH" = x86_64 ]; then
+    $SUDO yum install -y centos-release-scl
+elif [ "$ARCH" = arm64 ]; then
+    $SUDO yum install -y centos-release-scl-rh
+    $SUDO yum-config-manager --disable centos-sclo-rh
+    $SUDO yum-config-manager --enable centos-sclo-rh-testing
+fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 $SUDO yum-builddep -y $DIR/ceph.spec
 

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 0e96eb06da49634fda2eb3a79a04dd4945b8e436..ae0b5e3073b53543575c4cd44914cb031c68cc2a 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -30,7 +30,13 @@ cd ceph-*
 pwd
 
 $SUDO yum install -y yum-utils
-$SUDO yum install -y centos-release-scl
+if [ "$ARCH" = x86_64 ]; then
+    $SUDO yum install -y centos-release-scl
+elif [ "$ARCH" = arm64 ]; then
+    $SUDO yum install -y centos-release-scl-rh
+    $SUDO yum-config-manager --disable centos-sclo-rh
+    $SUDO yum-config-manager --enable centos-sclo-rh-testing
+fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 $SUDO yum-builddep -y $DIR/ceph.spec
 

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 0e96eb06da49634fda2eb3a79a04dd4945b8e436..ae0b5e3073b53543575c4cd44914cb031c68cc2a 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -30,7 +30,13 @@ cd ceph-*
 pwd
 
 $SUDO yum install -y yum-utils
-$SUDO yum install -y centos-release-scl
+if [ "$ARCH" = x86_64 ]; then
+    $SUDO yum install -y centos-release-scl
+elif [ "$ARCH" = arm64 ]; then
+    $SUDO yum install -y centos-release-scl-rh
+    $SUDO yum-config-manager --disable centos-sclo-rh
+    $SUDO yum-config-manager --enable centos-sclo-rh-testing
+fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 $SUDO yum-builddep -y $DIR/ceph.spec