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 cb521cb..157f2dc 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -8,7 +8,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -19,7 +19,7 @@
         - 'build':
             slave-label: 'opnfv-build-ubuntu'
         - 'test':
-            slave-label: 'intel-pod1'
+            slave-label: 'intel-pod10'
 #####################################
 # patch verification phases
 #####################################
@@ -48,6 +48,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 3
@@ -56,7 +57,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -90,7 +90,7 @@
                 - 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
@@ -103,7 +103,7 @@
                 - name: 'kvmfornfv-verify-test-{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
@@ -127,7 +127,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':
@@ -146,7 +145,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -185,7 +183,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -210,6 +207,7 @@
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
+        - multijob:
             name: cyclictest-test
             condition: SUCCESSFUL
             projects:
@@ -229,6 +227,7 @@
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
+        - multijob:
             name: packetforward-test
             condition: SUCCESSFUL
             projects:
@@ -257,7 +256,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':