diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-12 14:43:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-12 14:43:35 +0000 |
| commit | 740212c59d43970182745e0a39efe1b6dd97b81b (patch) | |
| tree | a416186526a2d938722e3225dfb7fde29be87f85 /jjb/apex/apex.yaml.j2 | |
| parent | 9057e154d4858727d13b364a196ee073bdf05377 (diff) | |
| parent | a97b6df03becc572ae29403b6069cc1496517088 (diff) | |
Merge "Apex: Allow for multi-version snapshots"
Diffstat (limited to 'jjb/apex/apex.yaml.j2')
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index df825d82e..bc2c379a9 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -8,7 +8,7 @@ - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' - 'apex-daily-{stream}' - - 'apex-csit-promote-daily-{stream}-os-{os_version}' + - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' - 'apex-fdio-promote-daily-{stream}' - 'apex-{scenario}-baremetal-{scenario_stream}' - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' @@ -81,6 +81,9 @@ - 'master': os_scenario: 'nofeature' + topology: + - 'noha' + - 'ha' # Fetch Logs Job - job-template: @@ -651,7 +654,7 @@ # CSIT promote - job-template: - name: 'apex-csit-promote-daily-{stream}-os-{os_version}' + name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}' # Job template for promoting CSIT Snapshots # @@ -679,6 +682,10 @@ name: PROMOTE default: 'True' description: "Used for overriding the PROMOTE" + - string: + name: GS_URL + default: $GS_BASE{gs-pathname}/{os_version}/{topology} + description: "User for overriding GS_URL from apex params" properties: - build-blocker: @@ -700,7 +707,7 @@ - name: 'apex-virtual-{stream}' current-parameters: true predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology} OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC |