summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSridhar Rao <sridhar.rao@spirent.com>2019-09-17 07:45:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-09-17 07:45:57 +0000
commitb984a2f40bec349c802b631a69526590b34bd5de (patch)
tree15db7b7b05ba4b190622e0e8ab62695a1d4b71d2
parentc98c9f6f3fd7706367e06f36f1e9cfd0c64c4c21 (diff)
parent57dce3c68fb63403be15e20f769ba7c38ba26537 (diff)
Merge "Python: Upgrade Python version from 3.4 to 3.6"
-rwxr-xr-xsystems/centos/build_base_machine.sh4
-rwxr-xr-xsystems/centos/prepare_python_env.sh4
-rwxr-xr-xsystems/rhel/7.2/build_base_machine.sh10
-rwxr-xr-xsystems/rhel/7.2/prepare_python_env.sh4
-rwxr-xr-xsystems/rhel/7.3/build_base_machine.sh10
-rwxr-xr-xsystems/rhel/7.3/prepare_python_env.sh4
-rwxr-xr-xsystems/rhel/7.5/build_base_machine.sh10
-rwxr-xr-xsystems/rhel/7.5/prepare_python_env.sh4
-rwxr-xr-xsystems/ubuntu/14.04/build_base_machine.sh2
9 files changed, 26 insertions, 26 deletions
diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index 95f9e211..0e1ed830 100755
--- a/systems/centos/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
@@ -76,8 +76,8 @@ sudo yum -y install centos-release-scl-rh
# install python34 packages and git-review tool
yum -y install $(echo "
-rh-python34
-rh-python34-python-tkinter
+rh-python36
+rh-python36-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 108ba1f6..4f5c0065 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 rh-python34 "
-virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
+scl enable rh-python36 "
+virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python36/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
"
diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index 198f39d7..c0f367ab 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -93,14 +93,14 @@ enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
EOT
-# install python34 packages and git-review tool
+# install python36 packages and git-review tool
yum -y install $(echo "
-rh-python34
-rh-python34-python-tkinter
+rh-python36
+rh-python36-python-tkinter
" | grep -v ^#)
-# cleanup python 34 repo file
-rm -f /etc/yum.repos.d/python34.repo
+# cleanup python 36 repo file
+rm -f /etc/yum.repos.d/python36.repo
# 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 047d6961..b7506568 100755
--- a/systems/rhel/7.2/prepare_python_env.sh
+++ b/systems/rhel/7.2/prepare_python_env.sh
@@ -21,8 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then
exit
fi
-scl enable rh-python34 "
-virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
+scl enable rh-python36 "
+virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python36/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
"
diff --git a/systems/rhel/7.3/build_base_machine.sh b/systems/rhel/7.3/build_base_machine.sh
index ae527214..42c36e4c 100755
--- a/systems/rhel/7.3/build_base_machine.sh
+++ b/systems/rhel/7.3/build_base_machine.sh
@@ -93,14 +93,14 @@ enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
EOT
-# install python34 packages and git-review tool
+# install python36 packages and git-review tool
yum -y install $(echo "
-rh-python34
-rh-python34-python-tkinter
+rh-python36
+rh-python36-python-tkinter
" | grep -v ^#)
-# cleanup python 34 repo file
-rm -f /etc/yum.repos.d/python34.repo
+# cleanup python 36 repo file
+rm -f /etc/yum.repos.d/python36.repo
# Create hugepage dirs
mkdir -p /dev/hugepages
diff --git a/systems/rhel/7.3/prepare_python_env.sh b/systems/rhel/7.3/prepare_python_env.sh
index 047d6961..b7506568 100755
--- a/systems/rhel/7.3/prepare_python_env.sh
+++ b/systems/rhel/7.3/prepare_python_env.sh
@@ -21,8 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then
exit
fi
-scl enable rh-python34 "
-virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
+scl enable rh-python36 "
+virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python36/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
"
diff --git a/systems/rhel/7.5/build_base_machine.sh b/systems/rhel/7.5/build_base_machine.sh
index 2073a38c..deb4e8a2 100755
--- a/systems/rhel/7.5/build_base_machine.sh
+++ b/systems/rhel/7.5/build_base_machine.sh
@@ -93,14 +93,14 @@ enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo
EOT
-# install python34 packages and git-review tool
+# install python36 packages and git-review tool
yum -y install $(echo "
-rh-python34
-rh-python34-python-tkinter
+rh-python36
+rh-python36-python-tkinter
" | grep -v ^#)
-# cleanup python 34 repo file
-rm -f /etc/yum.repos.d/python34.repo
+# cleanup python 36 repo file
+rm -f /etc/yum.repos.d/python36.repo
# Create hugepage dirs
mkdir -p /dev/hugepages
diff --git a/systems/rhel/7.5/prepare_python_env.sh b/systems/rhel/7.5/prepare_python_env.sh
index 047d6961..b7506568 100755
--- a/systems/rhel/7.5/prepare_python_env.sh
+++ b/systems/rhel/7.5/prepare_python_env.sh
@@ -21,8 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then
exit
fi
-scl enable rh-python34 "
-virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
+scl enable rh-python36 "
+virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python36/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
"
diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh
index a0e6895c..5501cab2 100755
--- a/systems/ubuntu/14.04/build_base_machine.sh
+++ b/systems/ubuntu/14.04/build_base_machine.sh
@@ -75,7 +75,7 @@ python3-setuptools
python3-dbus
python3-dev
python3-tk
-libpython3.4
+libpython3.6
python3-reportlab
# libs