From 9f6805f5a3f17633004325f2ac2b8bca3241128d Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Mon, 21 Mar 2016 12:15:23 -0400 Subject: 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 --- systems/CentOS/build_base_machine.sh | 78 ------------------------------------ systems/CentOS/prepare_python_env.sh | 29 -------------- 2 files changed, 107 deletions(-) delete mode 100755 systems/CentOS/build_base_machine.sh delete mode 100755 systems/CentOS/prepare_python_env.sh (limited to 'systems/CentOS') diff --git a/systems/CentOS/build_base_machine.sh b/systems/CentOS/build_base_machine.sh deleted file mode 100755 index 8339dd2d..00000000 --- a/systems/CentOS/build_base_machine.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -# -# Build a base machine for CentOS distro -# -# Copyright 2015 OPNFV -# -# 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. - -# Synchronize package index files -yum -y update - -# Install required packages -yum -y install $(echo " - -# Make, Compilers and devel -make -gcc -gcc-c++ -libxml2 -glibc.i686 -kernel-devel - -# tools -wget -git -scl-utils -vim -curl -autoconf -libtool -automake -pciutils -cifs-utils -sysstat - -# libs -libpcap-devel -libnet -fuse -fuse-libs -fuse-devel -zlib -zlib-devel -glib2-devel -pixman-devel -socat - -# install gvim -vim-X11 - -# install epel release required for git-review -epel-release -" | grep -v ^#) - -# install SCL for python33 -wget https://www.softwarecollections.org/en/scls/rhscl/python33/epel-7-x86_64/download/rhscl-python33-epel-7-x86_64.noarch.rpm -rpm -i rhscl-python33-epel-7-x86_64.noarch.rpm - -# install python33 packages and git-review tool -yum -y install $(echo " -python33 -python33-python-tkinter -git-review -" | grep -v ^#) diff --git a/systems/CentOS/prepare_python_env.sh b/systems/CentOS/prepare_python_env.sh deleted file mode 100755 index 5777448b..00000000 --- a/systems/CentOS/prepare_python_env.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Prepare Python 3 environment for vsperf execution -# -# Copyright 2015 OPNFV -# -# 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 - -scl enable python33 " -virtualenv "$VSPERFENV_DIR" -source "$VSPERFENV_DIR"/bin/activate -pip install -r ../requirements.txt -pip install pylint -" -- cgit 1.2.3-korg