X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=bootstrap-nsh_sfc-functional-virl.sh;h=12c77ae30314f3c4fa220c7841b02deb86d5c206;hb=3e36494dc1abb17f6c52772d8dcdc0574a4cb354;hp=f74942940e0e53c22d18eed0fddba427cc4f93ea;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git

diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh
index f74942940e..12c77ae303 100755
--- a/bootstrap-nsh_sfc-functional-virl.sh
+++ b/bootstrap-nsh_sfc-functional-virl.sh
@@ -17,15 +17,7 @@ set -x
 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
-
-if [ -f "/etc/redhat-release" ]; then
-    OS="centos7"
-else
-    OS="ubuntu1604"
-fi
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
 
 VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
 VIRL_SERVER=""
@@ -35,15 +27,20 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
-STREAM="master"
+STREAM=$1
+OS=$2
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
 
 if [ "${OS}" == "ubuntu1604" ]; then
+    export DEBIAN_FRONTEND=noninteractive
+    sudo apt-get -y update
+    sudo apt-get -y install libpython2.7-dev python-virtualenv
     VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
     VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
 elif [ "${OS}" == "centos7" ]; then
+    sudo yum install -y python-devel python-virtualenv
     VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
     VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
 else
@@ -238,3 +235,9 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     --exclude PERFTEST \
     --exclude SKIP_PATCH \
     tests/
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done