Merge changes from topic 'global-jjb-stack'

* changes:
  Remove unused csit macros and defaults
  Use new stack macros from global-jjb csit-apex
  Use new stack macros from gjjb csit-openstack
  Use new stack macros from gjjb csit-3node-docker
  Use new stack macros from global-jjb csit-3node
  Use new stack macros from global-jjb csit-1node

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01..cc01016fb6b772b1f98fe039ff52439d7da044ba 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -85,22 +85,6 @@
     # CSIT images configuration
     openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - 20181101-190143.891
     openstack_pike_system_image: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
-    stack-template: csit-2-instance-type.yaml
-    docker_system_count: 1
-    docker_system_flavor: odl-standard-1
-    docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
-    odl_system_count: 1
-    odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956
-    openstack_system_count: 1
-    openstack_system_flavor: odl-standard-4
-    openstack_system_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    openstack_system2_count: 0
-    openstack_system2_flavor: odl-standard-1
-    openstack_system2_image: ZZCI - CentOS 7 - devstack - 20180911-204116.460
-    tools_system_count: 1
-    tools_system_flavor: odl-highcpu-2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514
 
     # Default Robot framework options
     robot-options: ''

diff --git a/jjb/integration/integration-macros-heat.yaml b/jjb/integration/integration-macros-heat.yaml
new file mode 100644 (file)
index 0000000..f0882c5
--- /dev/null
+++ b/jjb/integration/integration-macros-heat.yaml
@@ -0,0 +1,199 @@
+---
+################
+# Stack 2 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 2 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-2-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+
+- builder:
+    name: integration-stack-2-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+
+################
+# Stack 3 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 3 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-3-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+      - string:
+          name: VM_2_COUNT
+          default: '{vm_2_count}'
+          description: 'Number of systems to spawn for vm 2'
+      - string:
+          name: VM_2_FLAVOR
+          default: '{vm_2_flavor}'
+          description: 'VM flavor to use for vm 2'
+      - string:
+          name: VM_2_IMAGE
+          default: '{vm_2_image}'
+          description: 'VM image to use for vm 2'
+
+- builder:
+    name: integration-stack-3-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+              vm_2_count: '$VM_2_COUNT'
+              vm_2_flavor: '$VM_2_FLAVOR'
+              vm_2_image: '$VM_2_IMAGE'
+
+################
+# Stack 4 Type #
+################
+
+# The parameter and builder macros are meant to be used together. Job templates
+# that want to use the Stack 4 Type must declare both the parameter and builder
+# component.
+
+- parameter:
+    name: integration-stack-4-type
+    parameters:
+      - string:
+          name: VM_0_COUNT
+          default: '{vm_0_count}'
+          description: 'Number of systems to spawn for vm 0'
+      - string:
+          name: VM_0_FLAVOR
+          default: '{vm_0_flavor}'
+          description: 'VM flavor to use for vm 0'
+      - string:
+          name: VM_0_IMAGE
+          default: '{vm_0_image}'
+          description: 'VM image to use for vm 0'
+      - string:
+          name: VM_1_COUNT
+          default: '{vm_1_count}'
+          description: 'Number of systems to spawn for vm 1'
+      - string:
+          name: VM_1_FLAVOR
+          default: '{vm_1_flavor}'
+          description: 'VM flavor to use for vm 1'
+      - string:
+          name: VM_1_IMAGE
+          default: '{vm_1_image}'
+          description: 'VM image to use for vm 1'
+      - string:
+          name: VM_2_COUNT
+          default: '{vm_2_count}'
+          description: 'Number of systems to spawn for vm 2'
+      - string:
+          name: VM_2_FLAVOR
+          default: '{vm_2_flavor}'
+          description: 'VM flavor to use for vm 2'
+      - string:
+          name: VM_2_IMAGE
+          default: '{vm_2_image}'
+          description: 'VM image to use for vm 2'
+      - string:
+          name: VM_3_COUNT
+          default: '{vm_3_count}'
+          description: 'Number of systems to spawn for vm 3'
+      - string:
+          name: VM_3_FLAVOR
+          default: '{vm_3_flavor}'
+          description: 'VM flavor to use for vm 3'
+      - string:
+          name: VM_3_IMAGE
+          default: '{vm_3_image}'
+          description: 'VM image to use for vm 3'
+
+
+- builder:
+    name: integration-stack-4-type
+    builders:
+      - lf-stack-create:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
+          openstack-heat-parameters: |
+              vm_0_count: '$VM_0_COUNT'
+              vm_0_flavor: '$VM_0_FLAVOR'
+              vm_0_image: '$VM_0_IMAGE'
+              vm_1_count: '$VM_1_COUNT'
+              vm_1_flavor: '$VM_1_FLAVOR'
+              vm_1_image: '$VM_1_IMAGE'
+              vm_2_count: '$VM_2_COUNT'
+              vm_2_flavor: '$VM_2_FLAVOR'
+              vm_2_image: '$VM_2_IMAGE'
+              vm_3_count: '$VM_2_COUNT'
+              vm_3_flavor: '$VM_2_FLAVOR'
+              vm_3_image: '$VM_2_IMAGE'

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index b533504f12e72fa5de9816f4dc1e223a1d1e8168..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -285,126 +285,6 @@
 # Shell Scripts #
 #################
 
-# Macro: integration-infra-stack
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: '{stack-template}'
-
-# Macro: integration-infra-stack-3-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-3-instance-type.yaml'
-
-# Macro: integration-apex-stack-3-type
-# Operation: Sets environment and then calls opendaylight-apex-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-apex-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-apex-stack:
-          stack-template: 'csit-apex-3-instance-type.yaml'
-
-# Macro: integration-infra-stack-4-type
-# Operation: Sets environment and then calls opendaylight-infra-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* job templates
-
-- builder:
-    name: integration-infra-stack-4-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # Setup openstack envirnoment file for use by
-          # the opendaylight-infra-stack macro
-          cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
-          parameters:
-              vm_0_count: {vm_0_count}
-              vm_0_flavor: {vm_0_flavor}
-              vm_0_image: {vm_0_image}
-              vm_1_count: {vm_1_count}
-              vm_1_flavor: {vm_1_flavor}
-              vm_1_image: {vm_1_image}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-              vm_3_count: {vm_3_count}
-              vm_3_flavor: {vm_3_flavor}
-              vm_3_image: {vm_3_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-4-instance-type.yaml'
-
 # Macro: integration-get-apex-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
 # Used by: {project}-csit-* apex related job templates

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 6a54a6713e0400546c819903438ede3d6f4970ea..50b821a59189b707b5949b0fae977fded095c160 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -69,6 +69,24 @@
     id: inttest-csit-verify-1node
     <<: *inttest_csit_common
 
+    #####################
+    # Default variables #
+    #####################
+
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
+
+    #####################
+    # Job configuration #
+    #####################
+
     parameters:
       - integration-csit-parameters:
           archive-artifacts: '{archive-artifacts}'
@@ -83,6 +101,13 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
@@ -115,14 +140,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -142,6 +163,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
@@ -156,7 +179,15 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here.
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
 
     #####################
     # Job configuration #
@@ -176,6 +207,13 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -210,14 +248,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -378,6 +412,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -408,6 +444,13 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 1
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -439,7 +482,15 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
 
     #####################
     # Job Configuration #
@@ -459,6 +510,13 @@
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
@@ -493,14 +551,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -521,6 +575,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
@@ -535,7 +591,15 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
 
     #####################
     # Job configuration #
@@ -555,6 +619,13 @@
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -589,14 +660,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -758,6 +825,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -788,6 +857,13 @@
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{tools_system_count}'
+          vm_1_flavor: '{tools_system_flavor}'
+          vm_1_image: '{tools_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -819,7 +895,16 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-2-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    docker_system_count: 1
+    docker_system_flavor: 'odl-standard-1'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
 
     #####################
     # Job Configuration #
@@ -839,6 +924,13 @@
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+      - integration-stack-2-type:
+          vm_0_count: 3
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{docker_system_count}'
+          vm_1_flavor: '{docker_system_flavor}'
+          vm_1_image: '{docker_system_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -866,14 +958,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
+      - integration-stack-2-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -923,6 +1011,8 @@
           robot_other_files: ''
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
@@ -937,7 +1027,22 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
 
     #####################
     # Job configuration #
@@ -957,6 +1062,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          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: '{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-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1102,20 +1220,10 @@
 
     builders:
       - lf-infra-pre-build
-      - 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: '{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-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1138,6 +1246,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -1170,6 +1280,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          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: '{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-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1316,7 +1439,22 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-4-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+
+    odl_system_count: 1
+    odl_system_flavor: 'odl-highcpu-4'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20181029-223449.514'
 
     #####################
     # Job configuration #
@@ -1336,6 +1474,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          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: '{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-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1485,20 +1636,10 @@
 
     builders:
       - lf-infra-pre-build
-      - 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: '{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-stack-4-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1521,6 +1662,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -1553,6 +1696,19 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-4-type:
+          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: '{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-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1817,7 +1973,9 @@
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-apex-3-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
 
     #####################
     # Job configuration #
@@ -1837,6 +1995,16 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -1891,17 +2059,10 @@
 
     builders:
       - lf-infra-pre-build
-      - integration-apex-stack-3-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+      - integration-stack-3-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
@@ -1922,6 +2083,8 @@
             - tempest_results.html
           robot-pass-threshold: 100.0
           robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
@@ -1954,6 +2117,16 @@
           debug-map: '{debug-map}'
           install-features: '{install-features}'
           use-features-boot: '{use-features-boot}'
+      - integration-stack-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: 1
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: 1
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream: