diff options
| -rw-r--r-- | jjb/qtip/qtip-experimental-jobs.yml | 14 | ||||
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml index b130912f3..ee143b4f3 100644 --- a/jjb/qtip/qtip-experimental-jobs.yml +++ b/jjb/qtip/qtip-experimental-jobs.yml @@ -7,7 +7,7 @@ name: qtip-experimental-jobs project: qtip jobs: - - 'qtip-experimental-{pod}-{stream}' + - 'qtip-{sut}-experimental-{pod}-{stream}' stream: - master: branch: '{stream}' @@ -19,12 +19,19 @@ installer: fuel pod: zte-virtual6 + # ------------------------------- + # SYSTEM UNDER TEST + # ------------------------------- + sut: + - 'host' + - 'vnf' + ################################ ## job templates ################################# - job-template: - name: 'qtip-experimental-{pod}-{stream}' + name: 'qtip-{sut}-experimental-{pod}-{stream}' disabled: '{obj:disabled}' @@ -34,6 +41,9 @@ branch: '{branch}' - '{installer}-defaults' - '{pod}-defaults' + - string: + name: SUT + default: '{sut}' scm: - git-scm-gerrit diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index 3a487faf7..282cb93e2 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -38,16 +38,23 @@ <<: *master # ------------------------------- + # SYSTEM UNDER TEST + # ------------------------------- + sut: + - 'host' + - 'vnf' + + # ------------------------------- # JOB LIST # ------------------------------- jobs: - - 'qtip-{qpi}-{installer}-{pod}-{stream}' + - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}' ################################ # job templates ################################ - job-template: - name: 'qtip-{qpi}-{installer}-{pod}-{stream}' + name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}' disabled: false parameters: @@ -76,6 +83,9 @@ - string: name: OPNFV_RELEASE default: '{stream}' + - string: + name: SUT + default: '{sut}' scm: - git-scm |