Add integration-infra-stack macro

This macro uses the opendaylight-infra-macro as well as includes the
integration-cleanup-workspace macro and shell script to generate the
stack environment file needed to spin up a Heat system.

Change-Id: Ica4f3a5600b56cf59daef4c79e10e0e6e16d8b12
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index e029397f850235eb01abb9412061715e9deb6b74..61f4cd7130164adc71cbb882cc74f8fd1ad6272e 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -256,6 +256,33 @@
 # 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-copy-ssh-keys
 # Operation: Copy ssh public key used as authentication for robot
 # Used by: {project}-csit-* job templates

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 207013ec98f7041ecaa6bdc9ad80123ed44ba43f..d703690218f558c1b61928dea6d6183b53f18457 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -28,12 +28,12 @@
     mininet-vms: 1
     docker-image: 'centos7-docker-2c-4g'
     stack-template: csit-2-instance-type.yaml
-    vm_0_count: 1
-    vm_0_flavor: 4 GB General Purpose v1
-    vm_0_image: CentOS 7 - java-builder - 20161031-0802
-    vm_1_count: 1
-    vm_1_flavor: 2 GB General Purpose v1
-    vm_1_image: Ubuntu 14.04 - mininet - 20161031-0803
+    odl_system_count: 1
+    odl_system_flavor: 4 GB General Purpose v1
+    odl_system_image: CentOS 7 - java-builder - 20161031-0802
+    tools_system_count: 1
+    tools_system_flavor: 2 GB General Purpose v1
+    tools_system_image: Ubuntu 14.04 - mininet - 20161031-0803
 
     # Robot
     robot-options: ''