merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/netready/netready.yml b/jjb/netready/netready.yml
index eff7b87..382434a 100644 (file)
--- a/jjb/netready/netready.yml
+++ b/jjb/netready/netready.yml
@@ -21,13 +21,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -68,17 +64,13 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'netready-parameter':
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - 'netready-gluon-build'