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

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index b11f953d84b3a273390960eae856d8e804c57606..f6be5c9ee578c0ecd1dee53cac344087c039ff13 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -37,4 +37,4 @@
     schedule: 'H H * * *'
 
     # Controller configuration
-    controller-image: 'centos7-java-builder-4c-8g'
+    odl_system_flavor: '8 GB General Purpose v1'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index e779e39373b62611ea0cbb6f526cb5f65d7ea0a3..bbd5fb22879b3fcb7994ee0d8aa24493c264a48d 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -38,7 +38,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    controller-image: 'centos7-java-builder-2c-8g'
+    odl_system_flavor: '8 GB General Purpose v1'
 
     build-timeout: '480'
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 4dd3384d87e572803221663b0254065b7ae77a4f..0f56a8874740044680bf9a9eea33a822f493a677 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -785,18 +785,19 @@
     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:
         - timed: '{schedule}'
 
     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-bulkomatic-clustering-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
index 4fe4dc6e44ad5833c8b5f39e845022a85adfbd2b..fc77dc7dca5a31a3618e083adcfda989c0480fa0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily-old.yaml
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Job images
-    controller-image: 'centos7-java-builder-4c-8g'
+    odl_system_flavor: '8 GB General Purpose v1'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index eb33ca7f3e65396e0ec76d4ac38e775cbf728c64..689f236dec1552c9b992a41ccbe8245bd5585c53 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -23,8 +23,8 @@
             scope: 'only'
 
     # Job images
-    controller-image: 'centos7-java-builder-4c-8g'
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    odl_system_flavor: '8 GB General Purpose v1'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
index 2f68fcb50b692fb7eb62943b0c5f1777a330f3f0..7b30d5a3a69e9cb6dd5beb0de8958186d2406826 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily-old.yaml
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Job images
-    controller-image: 'centos7-java-builder-4c-8g'
+    odl_system_flavor: '8 GB General Purpose v1'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
index d49e2f27efc4949a13c5636d493e6e6db8a97a71..7dfe8f27cee1706b30894863caa558eabfb139e6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-perf-daily.yaml
@@ -23,8 +23,8 @@
             scope: 'only'
 
     # Job images
-    controller-image: 'centos7-java-builder-4c-8g'
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+    odl_system_flavor: '8 GB General Purpose v1'
+    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui,odl-jolokia,decanter-collector-jmx,decanter-appender-elasticsearch'