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>

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 0b64c93..ab0b827 100644 (file)
--- 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 35228e7..8157aa1 100644 (file)
--- 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