Simplify gerrit-parameters into one macro

[releng/builder.git] / jjb / controller / controller.yaml

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 3d55374d6c40dfa7b31c0e952375ae745dff6e7e..a7ddc63547523e1b6c5299ceb0e0f69fc3ae578f 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -86,9 +86,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
-        - gerrit-refspec-parameter:
             refspec: 'refs/heads/{branch}'
 
     scm:
@@ -156,9 +156,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
-        - gerrit-refspec-parameter:
             refspec: 'refs/heads/{branch}'
 
     scm:
@@ -385,10 +385,10 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-project-parameter:
+        - gerrit-parameters:
             project: '{project}'
-        - gerrit-refspec-parameter:
-            refspec: '{branch}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - project-parameter:
             project: '{project}'
         - integration-distribution-git-url
@@ -671,8 +671,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - autorelease-release-tag:
             release-tag: 'validate'
         - autorelease-release-branch: