Enable Heat for docker templates

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 48679f5f5a53bfedcae33c430f2b174bae205f2f..67d218b6cafbb92185b2a37105799a352cd00f7f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -676,19 +676,20 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-docker:
-            controller-image: '{controller-image}'
-            controller-vms: 3
-            docker-image: '{docker-image}'
-            docker-vms: 1
 
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
 
     builders:
-        - integration-copy-ssh-keys
-        - integration-cleanup-workspace
+        - 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-install-robotframework
         - inject:
             properties-file: 'env.properties'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index d703690218f558c1b61928dea6d6183b53f18457..037925603bcdb819054716241d0b36687d10c54c 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -28,6 +28,9 @@
     mininet-vms: 1
     docker-image: 'centos7-docker-2c-4g'
     stack-template: csit-2-instance-type.yaml
+    docker_system_count: 1
+    docker_system_flavor: 4 GB General Purpose v1
+    docker_system_image: CentOS 7 - docker - 20161031-0802
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
     odl_system_image: CentOS 7 - java-builder - 20161031-0802