diff options
| -rw-r--r-- | jjb/apex/apex.yaml | 13 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 4e8e7cf40..0b64c93ca 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -194,9 +194,12 @@ - 'virtual' os_version: - - 'pike' - - 'queens' - - 'master' + - 'pike': + os_scenario: 'pike' + - 'queens': + os_scenario: 'queens' + - 'master': + os_scenario: 'nofeature' # Fetch Logs Job @@ -804,7 +807,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -822,7 +825,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 5230e7a2c..35228e7f4 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -74,9 +74,12 @@ - 'virtual' os_version: - - 'pike' - - 'queens' - - 'master' + - 'pike': + os_scenario: 'pike' + - 'queens': + os_scenario: 'queens' + - 'master': + os_scenario: 'nofeature' # Fetch Logs Job @@ -684,7 +687,7 @@ - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -702,7 +705,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_version}-noha + DEPLOY_SCENARIO=os-odl-{os_scenario}-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC |