6 files changed, 7 insertions, 217 deletions
diff --git a/systems/fedora/20/build_base_machine.sh b/systems/fedora/20/build_base_machine.sh
deleted file mode 100755
index 839d2bee..00000000
--- a/systems/fedora/20/build_base_machine.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Build a base machine for Fedora distro
-#
-# Copyright 2015 OPNFV, Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Contributors:
-#   Aihua Li, Huawei Technologies.
-#   Martin Klozik, Intel Corporation.
-#   Abdul Halim, Intel Corporation.
-
-yum -y install $(echo "
-# Make and Compilers
-make
-automake
-gcc
-gcc-c++
-libxml2
-glibc
-glib2-devel
-kernel-devel
-fuse-libs
-fuse
-fuse-devel
-
-# tools
-curl
-autoconf
-libtool
-libpcap-devel
-libnet
-vim
-wget
-git
-pciutils
-cifs-utils
-socat
-
-# install python packages
-python3
-python3-virtualenv
-python3-setuptools
-python3-pip
-python3-dbus
-python3-devel
-python3-tkinter
-systemd-python3
-python3-libs
-libreport-python3
-abrt-python3
-abrt-addon-python3
-
-# libs
-numactl
-numactl-devel
-
-# install git-review tool
-git-review
-" | grep -v ^#)
diff --git a/systems/fedora/20/prepare_python_env.sh b/systems/fedora/20/prepare_python_env.sh
deleted file mode 100755
index d0efd687..00000000
--- a/systems/fedora/20/prepare_python_env.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Prepare Python environment for vsperf execution on Fedora systems
-#
-# Copyright 2015 OPNFV, Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ -d "$VSPERFENV_DIR" ] ; then
-    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
-
-(virtualenv-3.3 "$VSPERFENV_DIR"
-source "$VSPERFENV_DIR"/bin/activate
-pip install -r ../requirements.txt
-pip install pylint)
diff --git a/systems/fedora/21/build_base_machine.sh b/systems/fedora/21/build_base_machine.sh
deleted file mode 100755
index e4969893..00000000
--- a/systems/fedora/21/build_base_machine.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-# Build a base machine for Fedora distro
-#
-# Copyright 2015 OPNFV, Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Contributors:
-#   Aihua Li, Huawei Technologies.
-#   Martin Klozik, Intel Corporation.
-#   Abdul Halim, Intel Corporation.
-
-yum -y install $(echo "
-# Make and Compilers
-make
-automake
-gcc
-gcc-c++
-libxml2
-glibc
-glib2-devel
-kernel-devel
-fuse-libs
-fuse
-fuse-devel
-kernel-modules-extra
-pixman-devel
-openssl-devel
-
-# tools
-curl
-autoconf
-libtool
-libpcap-devel
-libnet
-vim
-wget
-git
-pciutils
-cifs-utils
-socat
-
-# install python packages
-python3
-python3-virtualenv
-python3-setuptools
-python3-pip
-python3-dbus
-python3-devel
-python3-tkinter
-systemd-python3
-python3-libs
-libreport-python3
-abrt-python3
-abrt-addon-python3
-
-# libs
-numactl
-numactl-devel
-
-# install git-review tool
-git-review
-" | grep -v ^#) || exit 1
-
-# Create hugepage dirs
-mkdir -p /dev/hugepages
diff --git a/systems/fedora/21/prepare_python_env.sh b/systems/fedora/21/prepare_python_env.sh
deleted file mode 100755
index f348c75d..00000000
--- a/systems/fedora/21/prepare_python_env.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Prepare Python environment for vsperf execution on Fedora systems
-#
-# Copyright 2015 OPNFV, Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ -d "$VSPERFENV_DIR" ] ; then
-    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
-
-(virtualenv-3.4 "$VSPERFENV_DIR" || exit 1
-source "$VSPERFENV_DIR"/bin/activate || exit 1
-pip install -r ../requirements.txt || exit 1
-pip install pylint || exit 1)
diff --git a/systems/fedora/22/build_base_machine.sh b/systems/fedora/25/build_base_machine.sh
index 3cfe0c78..ad53ba76 100755..100644
--- a/systems/fedora/22/build_base_machine.sh
+++ b/systems/fedora/25/build_base_machine.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# Build a base machine for Fedora 22
+# Build a base machine for Fedora 25
 #
-# Copyright 2015 OPNFV, Intel Corporation.
+# Copyright 2017 OPNFV, Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-# Contributors:
-#   Aihua Li, Huawei Technologies.
-#   Martin Klozik, Intel Corporation.
-#   Abdul Halim, Intel Corporation.
 
 dnf -y install $(echo "
 # Make and Compilers
diff --git a/systems/fedora/22/prepare_python_env.sh b/systems/fedora/25/prepare_python_env.sh
index 0b2c5a32..4a85eb35 100755..100644
--- a/systems/fedora/22/prepare_python_env.sh
+++ b/systems/fedora/25/prepare_python_env.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 #
-# Prepare Python environment for vsperf execution on Fedora 22 systems.
+# Prepare Python environment for vsperf execution on Fedora 25 systems.
 #
-# Copyright 2015 OPNFV, Intel Corporation.
+# Copyright 2017 OPNFV, Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@ fi
 
 # enable virtual environment in a subshell, so QEMU build can use python 2.7
 
-(virtualenv-3.4 "$VSPERFENV_DIR"
+(virtualenv-3.5 "$VSPERFENV_DIR"
 source "$VSPERFENV_DIR"/bin/activate
 pip install -r ../requirements.txt
-pip install pylint)
-\ No newline at end of file
+pip install pylint
+pip install six)