diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-25 10:01:37 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-05-25 10:01:37 -0400 |
| commit | 8fdbad5ad35661d1042cd957975220ca30b40862 (patch) | |
| tree | 9807fb15e3afbf482cdab8c4cc74f2e32794f7bf | |
| parent | 118cf520832001a5f6b5c14ba866b804978c04e9 (diff) | |
Apex: migrate promote jobs to use virtual deploy job
This job already does deploy and test, so just use that rather than
triggering seperate jobs.
Change-Id: Ie62088f434de93ebb7638ba4d4ef8791ac01aa1f
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex.yaml | 25 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 25 |
2 files changed, 8 insertions, 42 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 0b64c93ca..ab0b8275b 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -801,11 +801,11 @@ builders: - multijob: - name: deploy-virtual + name: apex-virtual-deploy-test condition: SUCCESSFUL projects: - - name: 'apex-deploy-virtual-{stream}' - current-parameters: false + - name: 'apex-virtual-{stream}' + current-parameters: true predefined-parameters: | DEPLOY_SCENARIO=os-odl-{os_scenario}-noha OPNFV_CLEAN=yes @@ -817,24 +817,7 @@ node-parameters: true kill-phase-on: FAILURE abort-all-job: true - git-revision: false - - multijob: - name: functest-smoke - condition: SUCCESSFUL - projects: - - name: 'functest-apex-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-noha - FUNCTEST_SUITE_NAME=tempest_smoke_serial - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - git-revision: false + git-revision: true - multijob: name: create snapshot condition: SUCCESSFUL diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 35228e7f4..8157aa1de 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -681,11 +681,11 @@ builders: - multijob: - name: deploy-virtual + name: apex-virtual-deploy-test condition: SUCCESSFUL projects: - - name: 'apex-deploy-virtual-{stream}' - current-parameters: false + - name: 'apex-virtual-{stream}' + current-parameters: true predefined-parameters: | DEPLOY_SCENARIO=os-odl-{os_scenario}-noha OPNFV_CLEAN=yes @@ -697,24 +697,7 @@ node-parameters: true kill-phase-on: FAILURE abort-all-job: true - git-revision: false - - multijob: - name: functest-smoke - condition: SUCCESSFUL - projects: - - name: 'functest-apex-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-odl-{os_scenario}-noha - FUNCTEST_SUITE_NAME=tempest_smoke_serial - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - git-revision: false + git-revision: true - multijob: name: create snapshot condition: SUCCESSFUL |