From 8ef4983395b46a834e3ffe712197ec2e2f2b50d1 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 20 Feb 2017 19:25:30 +0100 Subject: Fix of centos bootstrap and dut_setup.sh Change-Id: I9fc3a74bf6356bdccee16c977df86567e91b4acf Signed-off-by: Jan Gelety --- bootstrap-centos.sh | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'bootstrap-centos.sh') diff --git a/bootstrap-centos.sh b/bootstrap-centos.sh index 6f8fba00b6..0e5e664e2a 100755 --- a/bootstrap-centos.sh +++ b/bootstrap-centos.sh @@ -17,8 +17,7 @@ set -x cat /etc/hostname cat /etc/hosts -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv +sudo yum install -y python-devel python-virtualenv VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") @@ -28,7 +27,7 @@ VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" VIRL_TOPOLOGY=double-ring-nested.centos7 -VIRL_RELEASE=csit-centos-7.3-1611 +VIRL_RELEASE=csit-centos-7.3-1611_2017-02-14_1.3 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" @@ -46,7 +45,7 @@ LOG_PATH="${SCRIPT_DIR}/tmp" # Use tmp dir for tarballs export TMPDIR="${SCRIPT_DIR}/tmp" -SHARED_MEMORY_PATH="/run/shm" +SHARED_MEMORY_PATH="/dev/shm" function ssh_do() { echo @@ -125,23 +124,21 @@ done echo "Selected VIRL servers: ${VIRL_SERVER[@]}" # Temporarily download VPP packages from nexus.fd.io +DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER).x86_64 +VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_CENTOS) +VPP_CLASSIFIER="" if [ "${#}" -ne "0" ]; then arr=(${@}) echo ${arr[0]} # DPDK is not part of the vpp build - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER) - wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${DPDK_STABLE_VER}/vpp-dpdk-dev-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit - wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit + wget -q "${VPP_REPO_URL}/vpp-dpdk-devel/${DPDK_STABLE_VER}/vpp-dpdk-devel-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit else rm -f *.rpm - DPDK_STABLE_VER=$(cat ${SCRIPT_DIR}/DPDK_STABLE_VER) - VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER) - VPP_REPO_URL=$(cat ${SCRIPT_DIR}/VPP_REPO_URL_CENTOS) - VPP_CLASSIFIER="-rpm" + VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_CENTOS) wget -q "${VPP_REPO_URL}/vpp/${VPP_STABLE_VER}/vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit - wget -q "${VPP_REPO_URL}/vpp-dbg/${VPP_STABLE_VER}/vpp-dbg-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit - wget -q "${VPP_REPO_URL}/vpp-dev/${VPP_STABLE_VER}/vpp-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit - wget -q "${VPP_REPO_URL}/vpp-dpdk-dev/${DPDK_STABLE_VER}/vpp-dpdk-dev-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit + wget -q "${VPP_REPO_URL}/vpp-debuginfo/${VPP_STABLE_VER}/vpp-debuginfo-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit + wget -q "${VPP_REPO_URL}/vpp-devel/${VPP_STABLE_VER}/vpp-devel-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit + wget -q "${VPP_REPO_URL}/vpp-dpdk-devel/${DPDK_STABLE_VER}/vpp-dpdk-devel-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit wget -q "${VPP_REPO_URL}/vpp-lib/${VPP_STABLE_VER}/vpp-lib-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit wget -q "${VPP_REPO_URL}/vpp-plugins/${VPP_STABLE_VER}/vpp-plugins-${VPP_STABLE_VER}${VPP_CLASSIFIER}.rpm" || exit fi -- cgit 1.2.3-korg