Use new stack macros from gjjb csit-openstack

Consolidate our stack scripts to using the one provided by global-jjb.

Issue: https://jira.linuxfoundation.org/browse/RELENG-238
Change-Id: I6b3abb6f2acfe1d5d68d2d802690ca6e433e20ba
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-macros-heat.yaml b/jjb/integration/integration-macros-heat.yaml
index 7a4f56cc3e38c5cab47867d20616abbd3306c0ee..cce67c854df079708c8fbe8b24550bb2d14c5618 100644 (file)
--- a/jjb/integration/integration-macros-heat.yaml
+++ b/jjb/integration/integration-macros-heat.yaml
@@ -49,3 +49,85 @@
               vm_1_count: '$VM_1_COUNT'
               vm_1_flavor: '$VM_1_FLAVOR'
               vm_1_image: '$VM_1_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-templates.yaml b/jjb/integration/integration-templates.yaml
index 38497e7f0f503905ae578f0d11a77736c6aec1b1..44a039d00eac8cb3a42bc4650cc03dffe7a511a9 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1027,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 #
@@ -1047,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:
@@ -1192,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'
@@ -1228,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:
@@ -1260,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:
@@ -1406,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 #
@@ -1426,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:
@@ -1575,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'
@@ -1611,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:
@@ -1643,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: