systems: Fix top level build_base_machine script to use ID

Modified top level build_base_machine.sh script to use ID
instead of Name from os-release file. Renamed folders to
adapt to this change.

* Modified ID variable assignment from echo to straight assignment.

JIRA: VSPERF-257

Change-Id: I22a7d5a1f191418cbc8fc9fd7d85b013e51b49bc
Signed-off-by: Christian Trautman <ctrautma@redhat.com>

2 files changed, 0 insertions, 132 deletions

diff --git a/systems/Red/7.2/build_base_machine.sh b/systems/Red/7.2/build_base_machine.sh
deleted file mode 100755
index a038f7b3..00000000
--- a/systems/Red/7.2/build_base_machine.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-#
-# Build a base machine for RHEL 7.2
-#
-# Copyright 2016 OPNFV, Intel Corporation & Red Hat Inc.
-#
-# 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.
-#   Christian Trautman, Red Hat Inc.
-
-# Make and Compilers
-pkglist=(\
- automake\
- fuse-devel\
- gcc\
- gcc-c++\
- glib2-devel\
- glibc.i686\
- kernel-devel\
- openssl-devel\
- pixman-devel\
- sysstat\
-)
-
-# Tools
-pkglist=(
- "${pkglist[@]}"\
- git\
- libtool\
- libpcap-devel\
- libnet\
- net-tools\
- openssl\
- openssl-devel\
- pciutils\
- socat\
- tk-devel\
- wget\
-)
-
-# python tools for proper QEMU, DPDK, and OVS make
-pkglist=(
- "${pkglist[@]}"\
- python-six\
-)
-
-# 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.
-failedinstall=()
-for pkg in ${pkglist[*]}; do
-    echo "Installing ${pkg}"
-    yum -y install ${pkg} || failedinstall=("${failedinstall[*]}" "$pkg")
-done
-
-if [ "${#failedinstall[*]}" -gt 0 ]; then
-    echo "The following packages failed to install. Please add appropriate repo\
- locations and/or subscription levels. Then run the build script again."
-    for fail in ${failedinstall[*]}; do
-        echo $fail
-    done
-    exit 1
-fi
-
-# python34 is not yet available to Red Hat customers so we will just build
-# it as an alternate install in usr/local for use with VSPerf. This prevents
-# any functionality issues with pre-installed packages using python.
-wget https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz
-tar -xf Python-3.4.2.tar.xz
-cd Python-3.4.2
-./configure
-make
-make altinstall
-cd ..
-
-# cleanup
-rm -Rf Python-3.4.2
-rm -f Python-3.4.2.tar.xz
-
-# need virtualenv
-pip3.4 install virtualenv
-
-# Create hugepage dirs
-mkdir -p /dev/hugepages
\ No newline at end of file
diff --git a/systems/Red/7.2/prepare_python_env.sh b/systems/Red/7.2/prepare_python_env.sh
deleted file mode 100755
index 1d51380a..00000000
--- a/systems/Red/7.2/prepare_python_env.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Prepare Python environment for vsperf execution on Red Hat 7.2 systems.
-#
-# Copyright 2016 OPNFV, Intel Corporation, Red Hat Inc.
-#
-# 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
-# Also make sure we know which virtualenv was installed. I've seen the file
-# name change pending on what type of installation was done.
-virtualenv_file=$(ls /usr/local/bin | awk '/virtualenv/')
-
-($virtualenv_file "$VSPERFENV_DIR"
-source "$VSPERFENV_DIR"/bin/activate
-pip3.4 install -r ../requirements.txt
-pip3.4 install pylint
-)
\ No newline at end of file