diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-04-25 18:28:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-04-25 18:28:37 +0000 |
| commit | 7d2ebe855f165cbea4692552c1996b0f32322e02 (patch) | |
| tree | 59d523e3495e15423da67567e03af3e35443176f | |
| parent | 4c0006dc78409663a80eb057542fde49615a3353 (diff) | |
| parent | 8ee579feffbf86df5ee1643775ce28673f7ffdbc (diff) | |
Merge "CSIT-554: Performance jobs reorganisation, part 4"
| -rw-r--r-- | jjb/vpp/include-raw-vpp-csit-verify-perf.sh | 5 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 41 |
2 files changed, 33 insertions, 13 deletions
diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh index 965ded9bd..b601137b0 100644 --- 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 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index eec6a7a36..76057cd69 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -45,7 +45,7 @@ name: vpp-misc jobs: - 'vpp-csit-verify-virl-{stream}' - - 'vpp-csit-verify-hw-perf-{stream}-{type}' + - 'vpp-csit-verify-hw-perf-{stream}' project: 'vpp' stream: - master: @@ -67,10 +67,7 @@ branch: 'stable/1704' repo-stream-part: 'stable.1704' os: ubuntu1604 - type: - - all - - short - - long + - job-template: name: 'vpp-verify-{stream}-{os}' @@ -333,7 +330,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'vpp-csit-verify-hw-perf-{stream}-{type}' + name: 'vpp-csit-verify-hw-perf-{stream}' project-type: freestyle node: '{os}-basebuild-4c-4g' @@ -354,8 +351,6 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' - - type-parameter: - type: '{type}' - is-csit-vpp-job-parameter: is-csit-vpp-job: 'True' @@ -370,10 +365,32 @@ build-timeout: 30 triggers: - - gerrit-trigger-manually-triggered: - comment-trigger-value: 'verify-perf-{type}' - name: '{project}' - branch: '{branch}' + - gerrit: + 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' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: false + failed: false + unstable: false + notbuilt: false builders: - shell: |