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

diff --git a/systems/Ubuntu/14.04/build_base_machine.sh b/systems/Ubuntu/14.04/build_base_machine.sh
deleted file mode 100755
index 3b4185fc..00000000
--- a/systems/Ubuntu/14.04/build_base_machine.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# Build a base machine for Ubuntu 14.04
-#
-# 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.
-
-apt-get update
-apt-get -y install $(echo "
-# Make and Compilers
-make
-automake
-gcc
-g++
-libc6
-libc6-dev
-libxml2
-fuse
-libfuse2
-libfuse-dev
-libssl1.0.0
-libssl-dev
-libglib2.0-dev
-zlib1g-dev
-
-# Linux Kernel Source
-linux-source
-linux-headers-$(uname -r)
-pkg-config
-
-# tools
-curl
-libcurl4-openssl-dev
-automake
-autoconf
-libtool
-libpcap-dev
-libnet1
-libncurses5-dev
-vim
-wget
-git
-pciutils
-cifs-utils
-socat
-libpixman-1-0
-libpixman-1-dev
-
-# Java runtime environment: Required for Ixia TclClient
-default-jre
-
-# install python packages
-python3
-python-pip
-python3-pip
-python3-setuptools
-python3-dbus
-python3-dev
-python3-tk
-libpython3.4
-python3-reportlab
-
-# install git-review tool
-git-review
-" | grep -v ^#)
-
-# fix: Ixia TclClient installation: cannot find 'libc.s0.6'
-ln -sf $(locate libc.so.6) /lib/libc.so.6
-
-# Install virtualenv
-pip3 install virtualenv
-
-# Create hugepage dirs
-mkdir -p /dev/hugepages
\ No newline at end of file
diff --git a/systems/Ubuntu/14.04/prepare_python_env.sh b/systems/Ubuntu/14.04/prepare_python_env.sh
deleted file mode 100755
index f9c2def8..00000000
--- a/systems/Ubuntu/14.04/prepare_python_env.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# Prepare Python environment for vsperf execution on Ubuntu 14.04 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