diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-07-26 17:34:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-07-26 17:34:26 +0000 |
| commit | cb83c7d7836fe987e6e85864a51edc966dbf4e33 (patch) | |
| tree | 343fdc7b655f0889a7cc041bd550de1339c2094a | |
| parent | 649387cf895a2c02f824421bd5c12089fe80e075 (diff) | |
| parent | 14c4231b413ee001c51be072ed65c8eb14de7b2f (diff) | |
Merge " Change the NSH SFC test trigger."
| -rw-r--r-- | jjb/csit/csit.yaml | 10 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh | 6 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh | 6 |
3 files changed, 18 insertions, 4 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 927f57de6..70ec1405f 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -3795,6 +3795,10 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - os-parameter: + os: 'ubuntu1604' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -3810,7 +3814,7 @@ - gerrit-trigger-manually-triggered: name: '{project}' branch: '{branch}' - comment-trigger-value: 'csit_nsh_sfc_perf' + comment-trigger-value: 'csit_nsh_sfc_perf_{stream}' builders: - shell: @@ -3847,6 +3851,8 @@ branch: '{branch}' - os-parameter: os: '{os}' + - stream-parameter: + stream: '{stream}' scm: - gerrit-trigger-scm: @@ -3862,7 +3868,7 @@ - gerrit-trigger-manually-triggered: name: '{project}' branch: '{branch}' - comment-trigger-value: 'csit_nsh_sfc_func' + comment-trigger-value: 'csit_nsh_sfc_func_{stream}' builders: - shell: diff --git a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh index 3e8857954..2f22a9842 100644 --- a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh +++ b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh @@ -7,7 +7,11 @@ then # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable chmod +x bootstrap-nsh_sfc-functional-virl.sh # run the script - ./bootstrap-nsh_sfc-functional-virl.sh + if [ ${STREAM} == 'master' ]; then + ./bootstrap-nsh_sfc-functional-virl.sh ${STREAM} ${OS} + else + ./bootstrap-nsh_sfc-functional-virl.sh 'stable.'${STREAM} ${OS} + fi else echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found' exit 1 diff --git a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh index e79020460..76248890f 100644 --- a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh +++ b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh @@ -10,6 +10,10 @@ fi # make sure that bootstrap-verify-perf.sh is executable chmod +x bootstrap-verify-perf-nsh_sfc.sh # run the script -./bootstrap-verify-perf-nsh_sfc.sh +if [ ${STREAM} == 'master' ]; then + ./bootstrap-verify-perf-nsh_sfc.sh ${STREAM} ${OS} +else + ./bootstrap-verify-perf-nsh_sfc.sh 'stable.'${STREAM} ${OS} +fi # vim: ts=4 ts=4 sts=4 et : |