diff options
Diffstat (limited to 'systems')
22 files changed, 68 insertions, 65 deletions
diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh index f2efb541..95f9e211 100755 --- a/systems/centos/build_base_machine.sh +++ b/systems/centos/build_base_machine.sh @@ -46,6 +46,7 @@ automake pciutils cifs-utils sysstat +sshpass # libs libpcap-devel @@ -60,6 +61,8 @@ pixman-devel socat numactl numactl-devel +libpng-devel +freetype-devel # install gvim vim-X11 @@ -68,13 +71,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..108ba1f6 100755 --- a/systems/centos/prepare_python_env.sh +++ b/systems/centos/prepare_python_env.sh @@ -21,9 +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 " diff --git a/systems/fedora/24/build_base_machine.sh b/systems/fedora/24/build_base_machine.sh index 2aceb34f..bbde9b77 100644 --- a/systems/fedora/24/build_base_machine.sh +++ b/systems/fedora/24/build_base_machine.sh @@ -48,6 +48,7 @@ pciutils cifs-utils socat sysstat +sshpass # install python packages python3 diff --git a/systems/fedora/24/prepare_python_env.sh b/systems/fedora/24/prepare_python_env.sh index 920604c2..bc93f703 100644 --- a/systems/fedora/24/prepare_python_env.sh +++ b/systems/fedora/24/prepare_python_env.sh @@ -25,5 +25,4 @@ fi (virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate -pip install -r ../requirements.txt -pip install pylint) +pip install -r ../requirements.txt) diff --git a/systems/fedora/25/build_base_machine.sh b/systems/fedora/25/build_base_machine.sh index 241b79cb..df8ae620 100644 --- a/systems/fedora/25/build_base_machine.sh +++ b/systems/fedora/25/build_base_machine.sh @@ -48,6 +48,7 @@ pciutils cifs-utils socat sysstat +sshpass # install python packages python3 diff --git a/systems/fedora/25/prepare_python_env.sh b/systems/fedora/25/prepare_python_env.sh index c4613ca4..b5df11ee 100644 --- a/systems/fedora/25/prepare_python_env.sh +++ b/systems/fedora/25/prepare_python_env.sh @@ -26,5 +26,4 @@ fi (virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint pip install six) diff --git a/systems/fedora/26/build_base_machine.sh b/systems/fedora/26/build_base_machine.sh index b8b65965..84c0695b 100644 --- a/systems/fedora/26/build_base_machine.sh +++ b/systems/fedora/26/build_base_machine.sh @@ -48,6 +48,7 @@ pciutils cifs-utils socat sysstat +sshpass # install python packages python3 diff --git a/systems/fedora/26/prepare_python_env.sh b/systems/fedora/26/prepare_python_env.sh index 05eedfd9..4db2eaed 100644 --- a/systems/fedora/26/prepare_python_env.sh +++ b/systems/fedora/26/prepare_python_env.sh @@ -26,5 +26,4 @@ fi (virtualenv-3.6 "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint pip install six) diff --git a/systems/opensuse/42.2/build_base_machine.sh b/systems/opensuse/42.2/build_base_machine.sh index 44d6f02b..9915b634 100755 --- a/systems/opensuse/42.2/build_base_machine.sh +++ b/systems/opensuse/42.2/build_base_machine.sh @@ -49,6 +49,7 @@ socat sysstat java-1_8_0-openjdk git-review +sshpass # python python3 diff --git a/systems/opensuse/42.2/prepare_python_env.sh b/systems/opensuse/42.2/prepare_python_env.sh index ab668ca4..a563740a 100755 --- a/systems/opensuse/42.2/prepare_python_env.sh +++ b/systems/opensuse/42.2/prepare_python_env.sh @@ -24,5 +24,4 @@ fi virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint diff --git a/systems/opensuse/42.3/build_base_machine.sh b/systems/opensuse/42.3/build_base_machine.sh index cc9f24ef..2124e6cb 100755 --- a/systems/opensuse/42.3/build_base_machine.sh +++ b/systems/opensuse/42.3/build_base_machine.sh @@ -50,6 +50,7 @@ sysstat java-1_8_0-openjdk git-review mlocate +sshpass # python python3 diff --git a/systems/opensuse/42.3/prepare_python_env.sh b/systems/opensuse/42.3/prepare_python_env.sh index ab668ca4..a563740a 100755 --- a/systems/opensuse/42.3/prepare_python_env.sh +++ b/systems/opensuse/42.3/prepare_python_env.sh @@ -24,5 +24,4 @@ fi virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint diff --git a/systems/opensuse/prepare_python_env.sh b/systems/opensuse/prepare_python_env.sh index 69871670..6ac196f0 100755 --- a/systems/opensuse/prepare_python_env.sh +++ b/systems/opensuse/prepare_python_env.sh @@ -24,5 +24,4 @@ fi virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh index 9eb8bbd2..198f39d7 100755 --- a/systems/rhel/7.2/build_base_machine.sh +++ b/systems/rhel/7.2/build_base_machine.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Build a base machine for RHEL 7.2 +# Build a base machine for RHEL 7.3 # # Copyright 2016 OPNFV, Intel Corporation & Red Hat Inc. # @@ -52,6 +52,8 @@ pkglist=( wget\ numactl\ numactl-devel\ + libpng-devel\ + sshpass\ ) # python tools for proper QEMU, DPDK, and OVS make @@ -60,6 +62,9 @@ pkglist=( python-six\ ) +# install RHEL compatible epel for sshpass +yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + # Iterate installing each package. If packages fail to install, record those # packages and exit with an error message on completion. Customer may need to # add repo locations and subscription levels. @@ -78,28 +83,24 @@ if [ "${#failedinstall[*]}" -gt 0 ]; then exit 1 fi -# 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 +# install SCL for python34 by adding a repo to find its location to install it +cat <<'EOT' >> /etc/yum.repos.d/python34.repo +[centos-sclo-rh] +name=CentOS-7 - SCLo rh +baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/ +gpgcheck=0 enabled=1 -enabled_metadata=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo EOT -# 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 " | grep -v ^#) -# cleanup python 33 repo file -rm -f /etc/yum.repos.d/python33.repo +# cleanup python 34 repo file +rm -f /etc/yum.repos.d/python34.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 fb5882f1..047d6961 100755 --- a/systems/rhel/7.2/prepare_python_env.sh +++ b/systems/rhel/7.2/prepare_python_env.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Prepare Python environment for vsperf execution on Red Hat 7.2 systems. +# Prepare Python environment for vsperf execution on RHEL 7.3 systems. # # Copyright 2016-2017 OPNFV, Intel Corporation, Red Hat Inc. # @@ -21,9 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then exit fi -scl enable python33 " -virtualenv "$VSPERFENV_DIR" --python /opt/rh/python33/root/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 -"
\ No newline at end of file +" diff --git a/systems/rhel/7.3/build_base_machine.sh b/systems/rhel/7.3/build_base_machine.sh index 5a9b4b2e..ae527214 100755 --- a/systems/rhel/7.3/build_base_machine.sh +++ b/systems/rhel/7.3/build_base_machine.sh @@ -52,6 +52,8 @@ pkglist=( wget\ numactl\ numactl-devel\ + libpng-devel\ + sshpass\ ) # python tools for proper QEMU, DPDK, and OVS make @@ -60,6 +62,9 @@ pkglist=( python-six\ ) +# install RHEL compatible epel for sshpass +yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + # Iterate installing each package. If packages fail to install, record those # packages and exit with an error message on completion. Customer may need to # add repo locations and subscription levels. @@ -78,31 +83,27 @@ if [ "${#failedinstall[*]}" -gt 0 ]; then exit 1 fi -# 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 +# install SCL for python34 by adding a repo to find its location to install it +cat <<'EOT' >> /etc/yum.repos.d/python34.repo +[centos-sclo-rh] +name=CentOS-7 - SCLo rh +baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/ +gpgcheck=0 enabled=1 -enabled_metadata=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo EOT -# 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 " | grep -v ^#) -# cleanup python 33 repo file -rm -f /etc/yum.repos.d/python33.repo +# cleanup python 34 repo file +rm -f /etc/yum.repos.d/python34.repo # Create hugepage dirs mkdir -p /dev/hugepages # prevent ovs vanilla from building from source due to kernel incompatibilities -sed -i s/'SUBBUILDS = src_vanilla'/'#SUBBUILDS = src_vanilla'/ ../src/Makefile
\ No newline at end of file +sed -i s/'SUBBUILDS = src_vanilla'/'#SUBBUILDS = src_vanilla'/ ../src/Makefile diff --git a/systems/rhel/7.3/prepare_python_env.sh b/systems/rhel/7.3/prepare_python_env.sh index b573bb9f..047d6961 100755 --- a/systems/rhel/7.3/prepare_python_env.sh +++ b/systems/rhel/7.3/prepare_python_env.sh @@ -21,9 +21,8 @@ if [ -d "$VSPERFENV_DIR" ] ; then exit fi -scl enable python33 " -virtualenv "$VSPERFENV_DIR" --python /opt/rh/python33/root/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 -"
\ No newline at end of file +" diff --git a/systems/sles/15/build_base_machine.sh b/systems/sles/15/build_base_machine.sh index 9c161dd7..166fe649 100755 --- a/systems/sles/15/build_base_machine.sh +++ b/systems/sles/15/build_base_machine.sh @@ -20,6 +20,7 @@ # Jose Lausuch, SUSE LINUX GmbH zypper -q -n dup +zypper ar -G http://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15/standard/ backports zypper -q -n in -y $(echo " # compiler, tools and dependencies make @@ -32,7 +33,6 @@ fuse fuse-devel glib2-devel zlib-devel -ncurses-devel kernel-default kernel-default-devel pkg-config @@ -47,7 +47,7 @@ pciutils cifs-utils socat sysstat -java-9-openjdk +java-10-openjdk mlocate # python @@ -65,14 +65,16 @@ libpixman-1-0-devel libtool libpcap-devel libnet9 -libncurses5 +libncurses6 libcurl4 libcurl-devel libxml2 libfuse2 -libopenssl1_1_0 +libopenssl1_1 libopenssl-devel libpython3_6m1_0 +libzmq5 +sshpass " | grep -v ^#) diff --git a/systems/sles/15/prepare_python_env.sh b/systems/sles/15/prepare_python_env.sh index 12ada3cc..18b0e545 100755 --- a/systems/sles/15/prepare_python_env.sh +++ b/systems/sles/15/prepare_python_env.sh @@ -24,5 +24,4 @@ fi virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh index 04f4a7e1..a0e6895c 100755 --- a/systems/ubuntu/14.04/build_base_machine.sh +++ b/systems/ubuntu/14.04/build_base_machine.sh @@ -62,6 +62,7 @@ socat libpixman-1-0 libpixman-1-dev sysstat +sshpass # Java runtime environment: Required for Ixia TclClient default-jre diff --git a/systems/ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh index 4c98dc42..f3d92dce 100755 --- a/systems/ubuntu/14.04/prepare_python_env.sh +++ b/systems/ubuntu/14.04/prepare_python_env.sh @@ -25,5 +25,4 @@ fi (virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3 source "$VSPERFENV_DIR"/bin/activate -pip install -r ../requirements.txt -pip install pylint) +pip install -r ../requirements.txt) diff --git a/systems/ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh index 1b42a790..2f3e7b25 100755 --- a/systems/ubuntu/build_base_machine.sh +++ b/systems/ubuntu/build_base_machine.sh @@ -46,6 +46,7 @@ apt-get -y install libglib2.0 apt-get -y install libfuse-dev apt-get -y install libnuma1 apt-get -y install libnuma-dev +apt-get -y install sshpass # Some useful tools you may optionally install #apt-get -y install ctags |