merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index c866d89..13c9671 100644 (file)
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -13,10 +13,10 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 
     project: 'onosfw'
 
@@ -31,7 +31,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -72,6 +71,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
@@ -94,6 +94,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: GS_URL