diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2018-06-18 18:41:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-06-18 18:41:24 +0000 |
| commit | e441518b23a5a1fe554347cc3a4982072be84eab (patch) | |
| tree | e1154e448dee56429163c2863d4dfdc28a5cc3b8 /jjb/vpp | |
| parent | ce3e3b893f2422d6c79c9ee7e4b3b45374fd6455 (diff) | |
| parent | 6baece1aa46181bb3021dd896f934c7e753ef234 (diff) | |
Merge "CSIT-PERF: New trigger design"
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-csit-verify-perf.sh | 15 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 18 |
2 files changed, 12 insertions, 21 deletions
diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh index c7d091bb1..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|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 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index c13098387..b12afd8a6 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -799,23 +799,7 @@ server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-l2' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip4' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ip6' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-lisp' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vxlan' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-vhost' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-acl' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-memif' - - comment-added-contains-event: - comment-contains-value: 'vpp-verify-perf-ipsechw' + comment-contains-value: 'perftest' projects: - project-compare-type: 'ANT' project-pattern: '{project}' |