Merge "CSIT-682 Usage of make-verify for vpp-csit-verify jobs"

[ci-management.git] / jjb / vpp / include-raw-vpp-csit-verify-perf.sh

diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
index a314260..4a7480a 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 set -xeu -o pipefail
 
-export TEST_TAG="PERFTEST_${TYPE^^}"
+TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+    | grep -oE 'vpp-verify-perf-(l2|ip4|ip6|lisp|vxlan|vhost)' \
+    | awk '{print toupper($0)}'`
+export TEST_TAG=${TRIGGER}
 
 # Get CSIT branch from which to test from
 # running build-root/scripts/csit-test-branch
@@ -10,7 +13,7 @@ if [ -x build-root/scripts/csit-test-branch ]; then
 fi
 
 # Clone csit and start tests
-git clone --depth 1 https://gerrit.fd.io/r/csit --branch csit-verified
+git clone --depth 1 https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}
 
 # If the git clone fails, complain clearly and exit
 if [ $? != 0 ]; then
@@ -20,6 +23,13 @@ if [ $? != 0 ]; then
 fi
 
 cp build-root/*.deb csit/
+if [ -e dpdk/vpp-dpdk-dkms*.deb ]
+then
+    cp dpdk/vpp-dpdk-dkms*.deb csit/
+else
+    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
+fi
+
 cd csit
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-verify-perf.sh ]
@@ -33,4 +43,4 @@ chmod +x bootstrap-verify-perf.sh
 # run the script
 ./bootstrap-verify-perf.sh *.deb
 
-# vim: ts=4 ts=4 sts=4 et :
\ No newline at end of file
+# vim: ts=4 ts=4 sts=4 et :