Merge "Find major version from stream, avoid mismatches"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 47c11a99d7b3cb94ad273adf09d18d6470ae7e91..cf0525e290eb2d45517e014c0f928aca447d6ae5 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:
@@ -1000,6 +1007,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
@@ -1122,16 +1131,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 +1164,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -1180,6 +1194,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
@@ -1307,7 +1323,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 +1331,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 +1353,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}