Enable Heat for {project}-csit-verify-3node-{functionality}

Change-Id: I930f2f4af5cc322608692845b48a7c16ffd8e2f1
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 87eabcdbb1a642e8d4ab1b86ea9d1d5ca69bf9a0..39e247ac3ead6e5b6cde18dd049508f3a4cc780c 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -29,8 +29,6 @@
             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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 3c43803a980dc47f3d0172d2e58aae7cf9a089c7..48679f5f5a53bfedcae33c430f2b174bae205f2f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -476,11 +476,6 @@
     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-trigger-patch-submitted:
@@ -490,8 +485,14 @@
             files: 'csit/suites/{project}/**'
 
     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 faab686622dac1d2908c0cc1e45b98a1eab4aebd..ae067f5c9b691580a019ef5a3763c4dec58794e1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -30,8 +30,6 @@
     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)

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 4b11311e878337832e09dfd75c0f65f57cc46c1a..aac85d123791005e78566d4cd916264affa502f8 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -31,8 +31,6 @@
     # 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)