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 8c62ad44c53d7b64f32aca1b5a984b6d7bf22e98..73e7ddd190ff68dfad1377d227a238b99f6ad018 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1,19 +1,18 @@
 # Job templates in this file (please update with every new template):
 #
-# Old (deprecating):
 # {project}-csit-verify-{functionality}-{stream}
 # {project}-csit-1node-imds-{functionality}-{install}-{stream}
 # {project}-csit-1node-cds-{functionality}-{install}-{stream}
 # {project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}
 # {project}-csit-3node-cds-{functionality}-{install}-{stream}
 #
-# New (use these when possible):
-# {project}-csit-verify-1node-fedora-{functionality}-{stream}
-# {project}-csit-1node-fedora-{functionality}-{install}-{stream}
-# {project}-csit-1node-fedora-periodic-{functionality}-{install}-{stream}
-# {project}-csit-verify-3node-fedora-{functionality}-{stream}
-# {project}-csit-3node-fedora-{functionality}-{install}-{stream}
-# {project}-csit-3node-fedora-periodic-{functionality}-{install}-{stream}
+# New (for Be release):
+# {project}-csit-verify-1node-{functionality}-{stream}
+# {project}-csit-1node-{functionality}-{install}-{stream}
+# {project}-csit-1node-periodic-{functionality}-{install}-{stream}
+# {project}-csit-verify-3node-{functionality}-{stream}
+# {project}-csit-3node-{functionality}-{install}-{stream}
+# {project}-csit-3node-periodic-{functionality}-{install}-{stream}
 #
 
 # Old templates
@@ -28,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:
@@ -56,7 +55,8 @@
         - build-timeout
         - integration-jclouds-controller-mininet:
             controller-vms: 1
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -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,18 +109,20 @@
             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-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -182,7 +184,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:
@@ -199,18 +201,20 @@
             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-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -273,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:
@@ -290,18 +294,19 @@
             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-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -362,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:
@@ -379,18 +384,20 @@
             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: 3
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -412,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'
@@ -449,7 +456,7 @@
 # New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-fedora-{functionality}-{stream}'
+    name: '{project}-csit-verify-1node-{functionality}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -458,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:
@@ -484,9 +491,10 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 1
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -513,7 +521,7 @@
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{project}-csit-1node-fedora-{functionality}-{install}-{stream}'
+    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -522,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:
@@ -539,18 +547,20 @@
             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-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 1
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -581,7 +591,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -593,7 +603,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -601,7 +611,7 @@
                 format: csv
 
 - job-template:
-    name: '{project}-csit-1node-fedora-periodic-{functionality}-{install}-{stream}'
+    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -610,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:
@@ -627,18 +637,20 @@
             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-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 1
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -667,7 +679,7 @@
             num-builds: '180'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -679,7 +691,7 @@
             num-builds: '180'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -687,7 +699,7 @@
                 format: csv
 
 - job-template:
-    name: '{project}-csit-verify-3node-fedora-{functionality}-{stream}'
+    name: '{project}-csit-verify-3node-{functionality}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -696,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:
@@ -722,9 +734,10 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 3
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -755,7 +768,7 @@
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{project}-csit-3node-fedora-{functionality}-{install}-{stream}'
+    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -764,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:
@@ -781,18 +794,20 @@
             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-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 3
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -828,7 +843,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-3node-cds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -840,7 +855,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-3node-cds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -848,7 +863,7 @@
                 format: csv
 
 - job-template:
-    name: '{project}-csit-3node-fedora-periodic-{functionality}-{install}-{stream}'
+    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -857,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:
@@ -874,18 +889,20 @@
             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-fedora-mininet:
+        - integration-jclouds-controller-mininet:
             controller-vms: 3
-            mininet-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -919,7 +936,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-3node-cds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -931,10 +948,9 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-3node-cds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-