fix ci jobs (daily && no branch param)

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

diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index 33ede47..07bcdc5 100644 (file)
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -36,10 +36,7 @@
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -75,13 +72,12 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - timed: '@midnight'
@@ -100,6 +96,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - string:
             name: GS_URL
@@ -107,10 +105,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'