diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2017-02-20 19:25:30 +0100 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2017-02-21 16:18:24 +0100 |
| commit | 8ef4983395b46a834e3ffe712197ec2e2f2b50d1 (patch) | |
| tree | ba2891762e92e09271d92c02509aa5057f66f1c9 /bootstrap-vpp-verify-semiweekly.sh | |
| parent | d92228369549613e2547c35f11e4bc2ab009d5ca (diff) | |
Fix of centos bootstrap and dut_setup.sh
Change-Id: I9fc3a74bf6356bdccee16c977df86567e91b4acf
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'bootstrap-vpp-verify-semiweekly.sh')
| -rw-r--r-- | bootstrap-vpp-verify-semiweekly.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh index 6fa505572b..b0402e0e3e 100644 --- a/bootstrap-vpp-verify-semiweekly.sh +++ b/bootstrap-vpp-verify-semiweekly.sh @@ -21,10 +21,6 @@ RETURN_STATUS=0 cat /etc/hostname cat /etc/hosts -export DEBIAN_FRONTEND=noninteractive -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv - PYBOT_ARGS="--noncritical MULTI_THREAD" ARCHIVE_ARTIFACTS=(log.html output.xml report.html) @@ -34,8 +30,12 @@ export PYTHONPATH=${SCRIPT_DIR} if [ -f "/etc/redhat-release" ]; then DISTRO="CENTOS" + sudo yum install -y python-devel python-virtualenv else DISTRO="UBUNTU" + export DEBIAN_FRONTEND=noninteractive + sudo apt-get -y update + sudo apt-get -y install libpython2.7-dev python-virtualenv fi # 1st step: Download and prepare VPP packages @@ -47,29 +47,29 @@ if [ "${#}" -ne "0" ]; then else case "$DISTRO" in CENTOS ) - rm -f *.rpm + PACKAGE=rpm ;; UBUNTU ) - rm -f *.deb + PACKAGE=deb esac # Download the latest VPP build install packages + rm -f *.${PACKAGE} echo Downloading VPP packages... bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install fi # Take vpp package and get the vpp version +VPP_PKGS=(*.$PACKAGE) case "$DISTRO" in CENTOS ) - VPP_PKGS=(*.rpm) VPP_VER="$( expr match $(ls *.rpm | head -n 1) 'vpp-\(.*\).rpm' )" - echo ${VPP_PKGS[@]} ;; UBUNTU ) - VPP_PKGS=(*.deb) VPP_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )" - echo ${VPP_PKGS[@]} esac +echo ${VPP_PKGS[@]} + set +x echo "****************************************************************************************************************************************" echo "1st step: Download VPP packages FINISHED" @@ -112,7 +112,7 @@ case "$DISTRO" in ;; UBUNTU ) VIRL_TOPOLOGY=double-ring-nested.xenial - VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6 + VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-20_1.7 esac SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" @@ -202,7 +202,7 @@ echo "Updated file names: " ${VPP_PKGS_VIRL[@]} cat ${VIRL_PKEY} # Copy the files to VIRL host -scp ${SSH_OPTIONS} *.deb \ +scp ${SSH_OPTIONS} *.${PACKAGE} \ ${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/ result=$? |