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, 95 deletions

diff --git a/systems/Fedora/20/build_base_machine.sh b/systems/Fedora/20/build_base_machine.sh
deleted file mode 100755
index 77d95779..00000000
--- a/systems/Fedora/20/build_base_machine.sh
+++ /dev/null
@@ -1,66 +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.i686
-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
-
-# install git-review tool
-git-review
-" | grep -v ^#)
\ No newline at end of file
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)