From 56e12cde71d4103e1b657ad3199f2bb9e0a3c8ea Mon Sep 17 00:00:00 2001 From: goldammx Date: Wed, 25 Jan 2017 03:42:51 -0500 Subject: fedora_remove_old: Remove installation scripts for Fedora 20-22 VSPERF with DPDK 16.04 and 16.07 did not work on Fedora 20-22. Installtion scripts for F20-F22 were deleted. VSPERF supports F24 and F25. JIRA: VSPERF-475 Change-Id: I3ce62b8883844cbcaab5b75fb9374068f9fced16 Signed-off-by: Martin Goldammer Reviewed-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Bill Michalowski Reviewed-by: Antonio Fischetti Reviewed-by: Sridhar Rao --- docs/configguide/installation.rst | 3 -- systems/fedora/20/build_base_machine.sh | 71 ------------------------------ systems/fedora/20/prepare_python_env.sh | 29 ------------ systems/fedora/21/build_base_machine.sh | 77 -------------------------------- systems/fedora/21/prepare_python_env.sh | 29 ------------ systems/fedora/22/build_base_machine.sh | 78 --------------------------------- systems/fedora/22/prepare_python_env.sh | 29 ------------ 7 files changed, 316 deletions(-) delete mode 100755 systems/fedora/20/build_base_machine.sh delete mode 100755 systems/fedora/20/prepare_python_env.sh delete mode 100755 systems/fedora/21/build_base_machine.sh delete mode 100755 systems/fedora/21/prepare_python_env.sh delete mode 100755 systems/fedora/22/build_base_machine.sh delete mode 100755 systems/fedora/22/prepare_python_env.sh diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst index 600c6bab..dd74f293 100644 --- a/docs/configguide/installation.rst +++ b/docs/configguide/installation.rst @@ -43,9 +43,6 @@ 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 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/22/build_base_machine.sh deleted file mode 100755 index 3cfe0c78..00000000 --- a/systems/fedora/22/build_base_machine.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -# -# Build a base machine for Fedora 22 -# -# 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. - -dnf -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 -sysstat - -# 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 ^#) - -# Create hugepage dirs -mkdir -p /dev/hugepages diff --git a/systems/fedora/22/prepare_python_env.sh b/systems/fedora/22/prepare_python_env.sh deleted file mode 100755 index 0b2c5a32..00000000 --- a/systems/fedora/22/prepare_python_env.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Prepare Python environment for vsperf execution on Fedora 22 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" -source "$VSPERFENV_DIR"/bin/activate -pip install -r ../requirements.txt -pip install pylint) \ No newline at end of file -- cgit 1.2.3-korg