Make install-features in controller jobs multiline

Also, odl-jolokia is not needed for 3node templates.

Change-Id: I68403544b4779c2cf5b0a89952b8cc6625386d65
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index f4857434deba235c7f707bdc739603a29453294a..9708367766dbbf6a8fa1acb93b43a2f26dd1eb6d 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -32,7 +32,10 @@
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app,
+        odl-jolokia
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index b81be3924a22a78ab40bf9bdffa63a515dc56ac7..ee70dbfe4e297c06429e8858350e197dc897ec59 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -33,7 +33,9 @@
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
index 6fb5d6e243421618ab1fb6dd73c3a81b979bf05d..a1fa0f355d491c9227e5dd97cf75f6cc648eaccb 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
@@ -29,7 +29,9 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-mdsal-benchmark
 
     # Robot custom options
     robot-options: '--exclude singlenode_setup'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 1c67a74431a99f9c9ec8f337cd962893c40336c1..8ab95ce935d8e14b19dad9312ec399679b3f1ef5 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -29,7 +29,10 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-mdsal-benchmark,
+        odl-jolokia
 
     # Robot custom options
     robot-options: '--exclude clustered_setup'

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 96d3eceecb1192f27390345994d01e4d1d907b8e..6ca973443e56557dd6c6d0eaef073fc09e03b825 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -29,7 +29,9 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index c5218ce60d4d488335207455229873b54a7bed11..0537ec216c100d616bad569b96687ebf0abe71c9 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -27,7 +27,9 @@
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
 
     # Robot custom options
     robot-options: ''