diff options
| -rw-r--r-- | INFO | 14 | ||||
| -rw-r--r-- | docs/configguide/installation.rst | 4 | ||||
| -rwxr-xr-x | systems/fedora/20/build_base_machine.sh | 71 | ||||
| -rwxr-xr-x | systems/fedora/20/prepare_python_env.sh | 29 | ||||
| -rwxr-xr-x | systems/fedora/21/build_base_machine.sh | 77 | ||||
| -rwxr-xr-x | systems/fedora/21/prepare_python_env.sh | 29 | ||||
| -rw-r--r--[-rwxr-xr-x] | systems/fedora/25/build_base_machine.sh (renamed from systems/fedora/22/build_base_machine.sh) | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | systems/fedora/25/prepare_python_env.sh (renamed from systems/fedora/22/prepare_python_env.sh) | 9 |
8 files changed, 16 insertions, 226 deletions
@@ -1,13 +1,14 @@ -Project: Characterize vSwitch Performance for Telco NFV Use Cases +Project: Data-plane performance testing and benchmarking Creation Date: December 16th, 2014 Category: Integration & Testing -Lifecycle State: Incubation -Primary Contact: Mike Lynch -Project Lead: maryam.tahhan@intel.com -Jira name vSwitch Characterization Project +Lifecycle State: Mature +Primary Contact: Trevor Cooper +Project Lead: (Trevor Cooper) trevor.cooper@intel.com +Jira name vSwitch Characterization JIRA tag : VSPERF -Mailing list tag: [vsperf] Repository: vswitchperf +Mailing list tag: [vsperf] +IRC: Server:freenode.net Channel: #opnfv-vswitchperf Commiters: maryam.tahhan@intel.com @@ -16,6 +17,7 @@ ctrautma@redhat.com martinx.klozik@intel.com sridhar.rao@spirent.com bmichalo@redhat.com +trevor.cooper@intel.com Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/ Link(s) to approval of additional submitters: diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst index b6b42bc2..dd74f293 100644 --- a/docs/configguide/installation.rst +++ b/docs/configguide/installation.rst @@ -43,10 +43,8 @@ Supported Operating Systems --------------------------- * CentOS 7.3 -* Fedora 20 -* Fedora 21 -* Fedora 22 * Fedora 24 (kernel 4.8 requires DPDK 16.11 and newer) +* Fedora 25 (kernel 4.9 requires DPDK 16.11 and newer) * RedHat 7.2 Enterprise Linux * RedHat 7.3 Enterprise Linux * Ubuntu 14.04 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) |