summaryrefslogtreecommitdiffstats
path: root/systems/centos
diff options
context:
space:
mode:
authorChristian Trautman <ctrautma@redhat.com>2018-02-06 11:49:55 -0500
committerChristian Trautman <ctrautma@redhat.com>2018-02-06 11:55:27 -0500
commit7a1a6fb5d55cb0b5463408730f0778add4549be9 (patch)
tree01f26bdd9103b1281568cf822c3b96f7e80cd9dd /systems/centos
parent23eff36d6a4b9e42ce06152e2b75e50fb7aaa5c5 (diff)
python34_update: Updated build scripts for Centos and RHEL to python34
Recent patch update to collectd requires new packages that must have python34 as a minimum version available. This updates the build scripts for Centos and RHEL to use scl enabled python34. 1. Adds needed packages to build correctly for Centos and RHEL 2. Changes repo location to pull scl enabled python34 3. Modifies enablement of scl to new package string 4. Updates documentation to reflect change JIRA: VSPERF-558 Change-Id: I52257ecfc6abc2112c30137c1de3ced272f21066 Signed-off-by: Christian Trautman <ctrautma@redhat.com>
Diffstat (limited to 'systems/centos')
-rwxr-xr-xsystems/centos/build_base_machine.sh12
-rwxr-xr-xsystems/centos/prepare_python_env.sh4
2 files changed, 9 insertions, 7 deletions
diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index f2efb541..a45b0c3d 100755
--- a/systems/centos/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
@@ -60,6 +60,8 @@ pixman-devel
socat
numactl
numactl-devel
+libpng-devel
+freetype-devel
# install gvim
vim-X11
@@ -68,13 +70,13 @@ vim-X11
epel-release
" | grep -v ^#)
-# install SCL for python33
-sudo yum -y install centos-release-scl
+# install SCL for python34
+sudo yum -y install centos-release-scl-rh
-# install python33 packages and git-review tool
+# install python34 packages and git-review tool
yum -y install $(echo "
-python33
-python33-python-tkinter
+rh-python34
+rh-python34-python-tkinter
git-review
" | grep -v ^#)
# prevent ovs vanilla from building from source due to kernel incompatibilities
diff --git a/systems/centos/prepare_python_env.sh b/systems/centos/prepare_python_env.sh
index 8bce53cc..ac7ccba4 100755
--- a/systems/centos/prepare_python_env.sh
+++ b/systems/centos/prepare_python_env.sh
@@ -21,8 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then
exit
fi
-scl enable python33 "
-virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
+scl enable rh-python34 "
+virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
pip install pylint