X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-csit-verify-perf.sh;h=4a7480ae1180b1a9c8bcbae12e945533f0dae2f2;hb=a247aa6703f3a09c0bcd74fd403c38876d5f3db3;hp=f24692de9c7b5631c8bcbbf765b060399a5d2497;hpb=2ea6567acf97ddd46e3ac91b198c6b8bd865ab75;p=ci-management.git

diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
index f24692de9..4a7480ae1 100644
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -1,12 +1,35 @@
 #!/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
+if [ -x build-root/scripts/csit-test-branch ]; then
+    CSIT_BRANCH=`build-root/scripts/csit-test-branch`;
+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
+    echo "Failed to run: git clone https://gerrit.fd.io/r/csit --branch ${CSIT_BRANCH:-csit-verified}"
+    echo "No such branch ${CSIT_BRANCH:-csit-verified} in https://gerrit.fd.io/r/csit"
+    exit
+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 ]
@@ -20,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 :