diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-04-20 16:37:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-04-20 16:37:27 +0000 |
| commit | 19093d46d0222eee457dedb55505d2ad42820cfa (patch) | |
| tree | c826d8e0d917acbb4028607b53572285b9f683d8 | |
| parent | 53e8424b2f35343f0195aa87602cd05f00336faa (diff) | |
| parent | 62afed518c3368a406173d0d92e10992feb9abf9 (diff) | |
Merge "Rename job to performance"
| -rw-r--r-- | jjb/csit/csit-vpp-functional.yaml | 22 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh | 15 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-vpp-perf-hw.sh | 17 |
3 files changed, 34 insertions, 20 deletions
diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml index d5fd68c8f..57a60f5a3 100644 --- a/jjb/csit/csit-vpp-functional.yaml +++ b/jjb/csit/csit-vpp-functional.yaml @@ -3,14 +3,15 @@ description: 'Run VPP functional tests on VIRL.' jobs: - - 'csit-vpp-functional-hw-tb2' + - 'csit-vpp-perf-hw-{type}' - 'csit-vpp-functional-virl' - 'csit-vpp-functional-nodepool' - 'csit-vpp-master-verify-weekly' project: 'csit' branch: 'master' - + type: + - all - job-template: name: 'csit-vpp-functional-virl' @@ -60,7 +61,7 @@ output-path: '' - job-template: - name: 'csit-vpp-functional-hw-tb2' + name: 'csit-vpp-perf-hw-{type}' project-type: freestyle node: verify @@ -77,6 +78,8 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - type-parameter: + type: '{type}' scm: - gerrit-trigger-scm: @@ -93,11 +96,11 @@ - gerrit-trigger-manually-triggered: name: '{project}' branch: '{branch}' - comment-trigger-value: 'hw-perf-check' + comment-trigger-value: 'verify-perf-{type}' builders: - shell: - !include-raw-escape jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh + !include-raw-escape jjb/csit/include-raw-csit-vpp-perf-hw.sh publishers: - archive-artifacts: @@ -201,3 +204,12 @@ message: "Verified CSIT version for VPP testing" create-tag: true update-tag: true + +- parameter: + name: test-type-parameter + + parameters: + - string: + name: TYPE + default: '{type}' + description: "Test TYPE parameter if not given by trigger" diff --git a/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh b/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh deleted file mode 100644 index 8fa41cb64..000000000 --- a/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# execute csit bootstrap script if it exists -if [ -e bootstrap-hw-tb2.sh ] -then - # make sure that bootstrap.sh is executable - chmod +x bootstrap-hw-tb2.sh - # run the script - ./bootstrap-hw-tb2.sh -else - echo 'ERROR: No bootstrap-hw-tb2.sh found' - exit 1 -fi - -# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/csit/include-raw-csit-vpp-perf-hw.sh b/jjb/csit/include-raw-csit-vpp-perf-hw.sh new file mode 100644 index 000000000..c247e7685 --- /dev/null +++ b/jjb/csit/include-raw-csit-vpp-perf-hw.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +export TEST_TAG="PERFTEST_${TYPE^^}" + +# execute csit bootstrap script if it exists +if [ ! -e bootstrap-hw-tb2.sh ] +then + echo 'ERROR: No bootstrap-hw-tb2.sh found' + exit 1 +fi + +# make sure that bootstrap-verify-perf.sh is executable +chmod +x bootstrap-hw-tb2.sh +# run the script +./bootstrap-hw-tb2.sh + +# vim: ts=4 ts=4 sts=4 et : |