aboutsummaryrefslogtreecommitdiffstats
path: root/systems/rhel
diff options
context:
space:
mode:
authorChristian Trautman <ctrautma@redhat.com>2016-11-14 10:20:01 -0500
committerChristian Trautman <ctrautma@redhat.com>2016-11-18 11:22:08 -0500
commit0fa10224b6a1b07d94b6d3c6e1cbc7a1f1306082 (patch)
treec9b9cbdc74f41f35f41dd769f7bd805d5c45b417 /systems/rhel
parent9c13028cf9b29da86e5b12c5d3b8c4d6bd858545 (diff)
Rhel_scl_python: Modify python build in place to scl usage
Previously Rhel install script would build python 3 in place using downloaded bits. It was suggested to change this to use scl method instead. This patch modifies the build in place to use scl method as per Centos scripts. JIRA: VSPERF-258 Change-Id: I5b6d7b8fd7f96a315d04e1ccdfd381908e0d1ad0 Signed-off-by: Christian Trautman <ctrautma@redhat.com>
Diffstat (limited to 'systems/rhel')
-rwxr-xr-xsystems/rhel/7.2/build_base_machine.sh24
-rwxr-xr-xsystems/rhel/7.2/prepare_python_env.sh17
2 files changed, 14 insertions, 27 deletions
diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index 2319535b..d57cf9c0 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -78,23 +78,15 @@ if [ "${#failedinstall[*]}" -gt 0 ]; then
exit 1
fi
-# python34 is not yet available to Red Hat customers so we will just build
-# it as an alternate install in usr/local for use with VSPerf. This prevents
-# any functionality issues with pre-installed packages using python.
-wget https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz
-tar -xf Python-3.4.2.tar.xz
-cd Python-3.4.2
-./configure
-make
-make altinstall
-cd ..
+# 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
-# cleanup
-rm -Rf Python-3.4.2
-rm -f Python-3.4.2.tar.xz
-
-# need virtualenv
-pip3.4 install virtualenv
+# install python33 packages and git-review tool
+yum -y install $(echo "
+python33
+python33-python-tkinter
+" | grep -v ^#)
# Create hugepage dirs
mkdir -p /dev/hugepages
diff --git a/systems/rhel/7.2/prepare_python_env.sh b/systems/rhel/7.2/prepare_python_env.sh
index 1d51380a..bd468d80 100755
--- a/systems/rhel/7.2/prepare_python_env.sh
+++ b/systems/rhel/7.2/prepare_python_env.sh
@@ -17,18 +17,13 @@
# limitations under the License.
if [ -d "$VSPERFENV_DIR" ] ; then
- echo "Directory $VSPERFENV_DIR already exists. Skipping python virtualenv \
-creation."
+ echo "Directory $VSPERFENV_DIR already exists. Skipping python virtualenv creation."
exit
fi
-# enable virtual environment in a subshell, so QEMU build can use python 2.7
-# Also make sure we know which virtualenv was installed. I've seen the file
-# name change pending on what type of installation was done.
-virtualenv_file=$(ls /usr/local/bin | awk '/virtualenv/')
-
-($virtualenv_file "$VSPERFENV_DIR"
+scl enable python33 "
+virtualenv "$VSPERFENV_DIR"
source "$VSPERFENV_DIR"/bin/activate
-pip3.4 install -r ../requirements.txt
-pip3.4 install pylint
-) \ No newline at end of file
+pip install -r ../requirements.txt
+pip install pylint
+" \ No newline at end of file