X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-csit-verify-perf.sh;h=c593048bedecd571351a98c5e62fdf753a48829f;hb=95a8c42349da54996cdc2c747d5d52b0ffed2e0d;hp=82cce8ae9cc26a2d5a503f0954a272e977eb5a5b;hpb=0828affb31e150bb0f113244f362ea53d9f8707a;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 82cce8ae9..c593048be 100644
--- 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)' \
-    | 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
@@ -12,14 +19,19 @@ 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_BRANCH:-csit-verified}
+# check CSIT_BRANCH value
+if [ "$CSIT_BRANCH" == "" ]; then
+    echo "CSIT_BRANCH not provided => 'latest' will be used"
+    CSIT_BRANCH="latest"
+fi
+
+# clone csit
+git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit
 
-# If the git clone fails, complain clearly and exit
+# 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
+    echo "Failed to run: git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit"
+    exit 1
 fi
 
 cp build-root/*.deb csit/
@@ -27,10 +39,48 @@ 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
+
+if [ "$CSIT_BRANCH" == "latest" ]; then
+    # set required CSIT branch_id based on VPP master branch; by default use 'oper'
+    case "$VPP_BRANCH" in
+        master )
+            BRANCH_ID="oper"
+            ;;
+        stable/1710 )
+            BRANCH_ID="oper-rls1710"
+            ;;
+        stable/1801 )
+            BRANCH_ID="oper-rls1801"
+            ;;
+        * )
+            BRANCH_ID="oper"
+    esac
+
+    # get the latest verified version of the required branch
+    CSIT_BRANCH=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
+
+    if [ "${CSIT_BRANCH}" == "" ]; then
+        echo "No verified CSIT branch found - exiting"
+        exit 1
+    fi
+
+    # remove 'origin/' from the branch name
+    CSIT_BRANCH=$(echo ${CSIT_BRANCH#origin/})
+fi
+
+# checkout the required csit branch
+git checkout ${CSIT_BRANCH}
+
+if [ $? != 0 ]; then
+    echo "Failed to checkout the required CSIT branch: ${CSIT_BRANCH}"
+    exit 1
+fi
+
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-verify-perf.sh ]
 then