Enable Heat for {project}-csit-3node-{functionality}-{install}-{stream}

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

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index cc5a46b8c31fa872049b678ef6d63058bcdc1507..87eabcdbb1a642e8d4ab1b86ea9d1d5ca69bf9a0 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -29,7 +29,9 @@
             scope: 'all'
 
     # No tools system VMs needed in JCloud configuration
+    # TODO: Remove mininet-vms as it's deprecated in favor of vm_1_count
     mininet-vms: 0
+    tools_system_count: 0
 
     # Features to install
     install-features: 'odl-restconf,odl-clustering-test-app'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0f56a8874740044680bf9a9eea33a822f493a677..3c43803a980dc47f3d0172d2e58aae7cf9a089c7 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -563,19 +563,20 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-jclouds-controller-mininet:
-            controller-image: '{controller-image}'
-            controller-vms: 3
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
 
     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: '{tools_system_count}'
+            vm_1_flavor: '{tools_system_flavor}'
+            vm_1_image: '{tools_system_image}'
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 5078cedf86b87f300f34e1282f10ef6efeac97a8..faab686622dac1d2908c0cc1e45b98a1eab4aebd 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -30,7 +30,9 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
+    # TODO: Remove mininet-image as it's deprecated in favor of vm_1_image
     mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index ac7b9a3936181d33aacfc4f5b0481de65d2de68a..4b11311e878337832e09dfd75c0f65f57cc46c1a 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -31,7 +31,9 @@
     # Robot custom options
     robot-options: ''
 
+    # TODO: Remove mininet-image as it's deprecated in favor of vm_1_image
     mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'