Merge "fix the judgement condition"

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bb49e42..5974383 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -294,6 +294,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -799,7 +800,7 @@
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
-                    DEPLOY_SCENARIO=os-odl_l2-netvirt_gbp_fdio-noha
+                    DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
                     OPNFV_CLEAN=yes
                   kill-phase-on: NEVER
                   abort-all-job: true
@@ -1181,7 +1182,9 @@
             condition: SUCCESSFUL
             projects:
               - name: 'apex-create-snapshot'
-                current-parameters: true
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=csit
                 node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true
@@ -1191,7 +1194,9 @@
             condition: SUCCESSFUL
             projects:
               - name: 'apex-upload-snapshot'
-                current-parameters: true
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=csit
                 node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true
@@ -1253,7 +1258,7 @@
                 - name: 'apex-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    DEPLOY_SCENARIO=os-odl_l2-netvirt_gbp_fdio-noha
+                    DEPLOY_SCENARIO=os-odl_netvirt-fdio-noha
                     OPNFV_CLEAN=yes
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -1269,7 +1274,9 @@
             condition: SUCCESSFUL
             projects:
               - name: 'apex-create-snapshot'
-                current-parameters: true
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=fdio
                 node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true
@@ -1279,7 +1286,9 @@
             condition: SUCCESSFUL
             projects:
               - name: 'apex-upload-snapshot'
-                current-parameters: true
+                current-parameters: false
+                predefined-parameters: |
+                  SNAP_TYPE=fdio
                 node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true