Merge "Update Ubuntu 14.04 images"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 09bc1c1877df9a6a93c2c53bcf09c014a9c71d03..89e41122f3e980c6bdd90a6e26c1d7537367e3bc 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -109,6 +109,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -224,6 +225,7 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -445,6 +447,7 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -531,6 +534,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -639,6 +643,7 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -749,6 +754,7 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -971,6 +977,7 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -1122,16 +1129,20 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack-3-type:
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{tools_system_count}'
-          vm_2_flavor: '{tools_system_flavor}'
-          vm_2_image: '{tools_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1151,6 +1162,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -1307,7 +1319,7 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack:
+      - integration-infra-stack-3-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
@@ -1315,6 +1327,9 @@
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1334,6 +1349,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
@@ -1363,7 +1379,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: 'karaf3'
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1422,7 +1438,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
@@ -1436,7 +1452,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml