Merge "CSIT-PERF: New trigger design"

[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 e2e88d8..c593048 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
+
 set -xeu -o pipefail
 
-TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
-    | grep -oE 'vpp-verify-perf-(l2|ip4|ip6|lisp|vxlan|vhost|acl|memif|ipsechw)' \
-    | awk '{print toupper($0)}'`
-export TEST_TAG=${TRIGGER}
+if [[ ${GERRIT_EVENT_TYPE} == 'comment-added' ]]; then
+    TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+        | grep -oE '(perftest$|perftest[[:space:]].+$)'`
+else
+    TRIGGER=''
+fi
+# Export test type.
+export TEST_TAG="VERIFY-PERF-PATCH"
+# Export test tags as string.
+export TEST_TAG_STRING=${TRIGGER#$"perftest"}
 
 # Get CSIT branch from which to test from
 # running build-root/scripts/csit-test-branch
@@ -32,7 +39,8 @@ 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/
+    cp /w/dpdk/vpp-dpdk-dkms*.deb csit/ 2>/dev/null || :
+    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/ 2>/dev/null || :
 fi
 
 cd csit