merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index fdce301..157f2dc 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -19,7 +19,7 @@
         - 'build':
             slave-label: 'opnfv-build-ubuntu'
         - 'test':
-            slave-label: 'intel-pod1'
+            slave-label: 'intel-pod10'
 #####################################
 # patch verification phases
 #####################################
@@ -57,7 +57,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -91,25 +90,25 @@
                 - name: 'kvmfornfv-verify-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                  node-parameters: false
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: test
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-verify-test-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
-#        - multijob:
-#            name: test
-#            condition: SUCCESSFUL
-#            projects:
-#                - name: 'kvmfornfv-verify-test-{stream}'
-#                  current-parameters: false
-#                  predefined-parameters: |
-#                    GERRIT_BRANCH=$GERRIT_BRANCH
-#                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                  node-parameters: false
-#                  kill-phase-on: FAILURE
-#                  abort-all-job: true
 - job-template:
     name: 'kvmfornfv-verify-{phase}-{stream}'
 
@@ -128,7 +127,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':
@@ -147,7 +145,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -186,7 +183,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -195,8 +191,8 @@
     scm:
         - git-scm
 
-#    triggers:
-#        - timed: '@midnight'
+    triggers:
+        - timed: '@midnight'
 
     builders:
         - description-setter:
@@ -260,7 +256,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':