Merge "Update l2gw csit with supported release combos"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 335a3ec95caab464c854f419189ab7943401d91d..aa8d9587cd4a03b02c87299f08dda95bf6873c30 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,10 +1007,14 @@
           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:
           test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -1014,6 +1025,10 @@
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
@@ -1062,7 +1077,11 @@
       - string:
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          description: 'comma separated list of services to enable on controller nodes'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1122,16 +1141,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 +1174,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
@@ -1180,10 +1204,14 @@
           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:
           test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -1194,6 +1222,10 @@
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
@@ -1243,6 +1275,10 @@
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
           description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1337,6 +1373,7 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
+      - integration-csit-run-postscript
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}