Merge "scl_fix: Fix broken link to install python33"

2 files changed, 17 insertions, 5 deletions

diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index d94dc975..5430ceba 100755
--- a/systems/centos/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
@@ -69,8 +69,7 @@ epel-release
 " | grep -v ^#)
 
 # install SCL for python33
-wget https://www.softwarecollections.org/en/scls/rhscl/python33/epel-7-x86_64/download/rhscl-python33-epel-7-x86_64.noarch.rpm
-rpm -i rhscl-python33-epel-7-x86_64.noarch.rpm
+sudo yum -y install centos-release-scl
 
 # install python33 packages and git-review tool
 yum -y install $(echo "
diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index d57cf9c0..9eb8bbd2 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -78,9 +78,19 @@ if [ "${#failedinstall[*]}" -gt 0 ]; then
     exit 1
 fi
 
-# install SCL for python33
-wget https://www.softwarecollections.org/en/scls/rhscl/python33/epel-7-x86_64/download/rhscl-python33-epel-7-x86_64.noarch.rpm
-rpm -i rhscl-python33-epel-7-x86_64.noarch.rpm
+# install SCL for python33 by adding a repo to find its location to install it
+cat <<'EOT' >> /etc/yum.repos.d/python33.repo
+[rhscl-python33-el7]
+name=Copr repo for python33-el7 owned by rhscl
+baseurl=https://copr-be.cloud.fedoraproject.org/results/rhscl/python33-el7/epel-7-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/rhscl/python33-el7/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
+EOT
 
 # install python33 packages and git-review tool
 yum -y install $(echo "
@@ -88,5 +98,8 @@ python33
 python33-python-tkinter
 " | grep -v ^#)
 
+# cleanup python 33 repo file
+rm -f /etc/yum.repos.d/python33.repo
+
 # Create hugepage dirs
 mkdir -p /dev/hugepages