Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
CSIT-1400: Prepare and publish 1810.03 Report
[csit.git]
/
bootstrap-nsh_sfc-functional-virl.sh
diff --git
a/bootstrap-nsh_sfc-functional-virl.sh
b/bootstrap-nsh_sfc-functional-virl.sh
index
70a68c0
..
034ea9b
100755
(executable)
--- a/
bootstrap-nsh_sfc-functional-virl.sh
+++ b/
bootstrap-nsh_sfc-functional-virl.sh
@@
-17,10
+17,18
@@
set -x
cat /etc/hostname
cat /etc/hosts
cat /etc/hostname
cat /etc/hosts
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+
export DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
sudo apt-get -y install libpython2.7-dev python-virtualenv
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
+
VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
VIRL_SERVER=""
VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
VIRL_SERVER=""
@@
-29,8
+37,7
@@
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
-STREAM=$1
-OS=$2
+STREAM="master"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export PYTHONPATH=${SCRIPT_DIR}
@@
-122,7
+129,7
@@
done
# Download VPP and NSH SFC packages from the current branch
echo Downloading packages...
# Download VPP and NSH SFC packages from the current branch
echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_nsh_sfc_pkgs.sh ${STREAM} ${OS}
+bash ${SCRIPT_DIR}/resources/tools/
scripts/
download_nsh_sfc_pkgs.sh ${STREAM} ${OS}
if [ "${OS}" == "centos7" ]; then
VPP_PKGS=(*.rpm)
if [ "${OS}" == "centos7" ]; then
VPP_PKGS=(*.rpm)
@@
-228,8
+235,14
@@
fi
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
PYTHONPATH=`pwd` pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
- --suite "
nsh_sfc_tests
.func" \
+ --suite "
tests.nsh_sfc
.func" \
--include vm_envAND3_node_single_link_topo \
--exclude PERFTEST \
--exclude SKIP_PATCH \
--include vm_envAND3_node_single_link_topo \
--exclude PERFTEST \
--exclude SKIP_PATCH \
- nsh_sfc_tests/
+ tests/
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done