Merge "Adding upstream dependencies into GBP clustering"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5d219ce749d60a104780d47a0fb0ff1fda49d9d1..73e7ddd190ff68dfad1377d227a238b99f6ad018 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -27,7 +27,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -92,7 +92,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -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:
@@ -275,7 +277,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -292,15 +294,15 @@
             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:
-        - build-timeout
         - integration-jclouds-controller-mininet:
             controller-vms: 1
             mininet-image: '{mininet-image}'
@@ -365,7 +367,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -382,11 +384,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:
@@ -416,7 +419,7 @@
         - integration-start-cluster-run-test
     publishers:
         - integration-robot:
-            unstable-if: 95.0
+            unstable-if: 0.0
             pass-if: 100.0
         - archive:
             artifacts: '*karaf.log'
@@ -462,7 +465,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -527,7 +530,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -544,11 +547,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:
@@ -616,7 +620,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -633,11 +637,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:
@@ -703,7 +708,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -772,7 +777,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -789,11 +794,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:
@@ -866,7 +872,7 @@
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
         - project-parameter:
@@ -883,11 +889,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:
@@ -947,4 +954,3 @@
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-