Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add vpp perf jobs to report
[csit.git]
/
bootstrap-vpp-verify-semiweekly.sh
diff --git
a/bootstrap-vpp-verify-semiweekly.sh
b/bootstrap-vpp-verify-semiweekly.sh
index
2897292
..
8f46ac6
100644
(file)
--- 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
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)
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"
if [ -f "/etc/redhat-release" ]; then
DISTRO="CENTOS"
+ sudo yum install -y python-devel python-virtualenv
else
DISTRO="UBUNTU"
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
fi
# 1st step: Download and prepare VPP packages
@@
-47,29
+47,29
@@
if [ "${#}" -ne "0" ]; then
else
case "$DISTRO" in
CENTOS )
else
case "$DISTRO" in
CENTOS )
-
rm -f *.
rpm
+
PACKAGE=
rpm
;;
UBUNTU )
;;
UBUNTU )
-
rm -f *.
deb
+
PACKAGE=
deb
esac
esac
- # Download the latest VPP build .deb install packages
+ # Download the latest VPP build install packages
+ rm -f *.${PACKAGE}
echo Downloading VPP packages...
echo Downloading VPP packages...
- bash ${SCRIPT_DIR}/resources/tools/download_install_vpp_pkgs.sh --skip-install
+ bash ${SCRIPT_DIR}/resources/tools/
scripts/
download_install_vpp_pkgs.sh --skip-install
fi
# Take vpp package and get the vpp version
fi
# Take vpp package and get the vpp version
+VPP_PKGS=(*.$PACKAGE)
case "$DISTRO" in
CENTOS )
case "$DISTRO" in
CENTOS )
- VPP_PKGS="$( readlink -f *.rpm | tr '\n' ' ' )"
VPP_VER="$( expr match $(ls *.rpm | head -n 1) 'vpp-\(.*\).rpm' )"
VPP_VER="$( expr match $(ls *.rpm | head -n 1) 'vpp-\(.*\).rpm' )"
- echo ${VPP_PKGS[@]}
;;
UBUNTU )
;;
UBUNTU )
- VPP_PKGS="$( readlink -f *.deb | tr '\n' ' ' )"
VPP_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )"
VPP_VER="$( expr match $(ls *.deb | head -n 1) 'vpp-\(.*\)-deb.deb' )"
- echo ${VPP_PKGS[@]}
esac
esac
+echo ${VPP_PKGS[@]}
+
set +x
echo "****************************************************************************************************************************************"
echo "1st step: Download VPP packages FINISHED"
set +x
echo "****************************************************************************************************************************************"
echo "1st step: Download VPP packages FINISHED"
@@
-104,15
+104,16
@@
VIRL_USERNAME=jenkins-in
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
VIRL_PKEY=priv_key
VIRL_SERVER_STATUS_FILE="status"
VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+VIRL_SESSION_EXPIRY="620"
case "$DISTRO" in
CENTOS )
case "$DISTRO" in
CENTOS )
- VIRL_TOPOLOGY=
double-ring-nested.centos7
- VIRL_RELEASE=
csit-centos-7.3-1611_2017-02-14_1.3
+ VIRL_TOPOLOGY=
$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+ VIRL_RELEASE=
$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
;;
UBUNTU )
;;
UBUNTU )
- VIRL_TOPOLOGY=
double-ring-nested.xenial
- VIRL_RELEASE=
csit-ubuntu-16.04.1_2016-12-19_1.6
+ VIRL_TOPOLOGY=
$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+ VIRL_RELEASE=
$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
esac
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
esac
SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@
-202,7
+203,7
@@
echo "Updated file names: " ${VPP_PKGS_VIRL[@]}
cat ${VIRL_PKEY}
# Copy the files to VIRL host
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=$?
${VIRL_USERNAME}@${VIRL_SERVER}:${VIRL_DIR_LOC}/
result=$?
@@
-222,7
+223,9
@@
function stop_virl_simulation {
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
VIRL_SID=$(ssh ${SSH_OPTIONS} \
${VIRL_USERNAME}@${VIRL_SERVER} \
- "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_PKGS_VIRL[@]}")
+ "start-testcase -vv --copy ${VIRL_TOPOLOGY} \
+ --expiry ${VIRL_SESSION_EXPIRY} \
+ --release ${VIRL_RELEASE} ${VPP_PKGS_VIRL[@]}")
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
retval=$?
if [ ${retval} -ne "0" ]; then
echo "VIRL simulation start failed"
@@
-275,7
+278,7
@@
do
pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
pybot -L TRACE -W 136\
-v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \
- --suite "tests.func" \
+ --suite "tests.
vpp.
func" \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \
--include vm_envAND3_node_single_link_topo \
--include vm_envAND3_node_double_link_topo \
--exclude PERFTEST \