From e029fc382999c82bf94984fb350ab5b8ae07a065 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 2 Mar 2017 12:36:40 +0100 Subject: [PATCH] Make install-features in controller jobs multiline Also, odl-jolokia is not needed for 3node templates. Change-Id: I68403544b4779c2cf5b0a89952b8cc6625386d65 Signed-off-by: Vratko Polak --- jjb/controller/controller-csit-akka1.yaml | 5 ++++- jjb/controller/controller-csit-clustering.yaml | 4 +++- .../controller-csit-periodic-dsbenchmark-cluster.yaml | 4 +++- jjb/controller/controller-csit-periodic-dsbenchmark.yaml | 5 ++++- jjb/controller/controller-csit-rest-cars-perf.yaml | 4 +++- jjb/controller/controller-csit-rest-clust-cars-perf.yaml | 4 +++- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index f4857434d..970836776 100644 --- 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 b81be3924..ee70dbfe4 100644 --- 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 6fb5d6e24..a1fa0f355 100644 --- 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 1c67a7443..8ab95ce93 100644 --- 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 96d3eceec..6ca973443 100644 --- 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 c5218ce60..0537ec216 100644 --- 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: '' -- 2.36.6