X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fonosfw%2Fonosfw.yml;h=9d6b037e1d6124512f53b1b7bd0797dde8c1bf64;hb=270d47819058ba5a2b36f71ddfb064e05653abeb;hp=33ede475f31c634d7815886712cf98ded3821f71;hpb=d6e609cd29998ea7c146eea48fbaa40994f4e29f;p=releng.git

diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index 33ede475f..9d6b037e1 100644
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -13,7 +13,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -31,15 +31,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -60,6 +56,7 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
@@ -75,13 +72,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - timed: '@midnight'
@@ -100,6 +95,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: GS_URL
@@ -107,10 +103,7 @@
             description: "Directory where the build artifact will be located upon the completion     of the build."
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - 'builder-onosfw-helloworld'