Improve formatting of trigger list to be more maintainable

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5d219ce749d60a104780d47a0fb0ff1fda49d9d1..e42fab9aa16565b7b34b16d52d5ca2920e4f3066 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -109,11 +109,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -200,11 +201,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -292,11 +294,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -382,11 +385,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -544,11 +548,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -633,11 +638,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -789,11 +795,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
@@ -883,11 +890,12 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: '{branch}'
 
     scm:
-        - git-scm:
+        - integration-patch-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers: