Merge "Add federation distribution-check & autorelease-check to jenkins"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index e74deb1e399c55021699bb61bae830112cfbff1a..876e4981eb226f1caa8c767e8a87880380c1001c 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -55,7 +55,8 @@
         odl-restconf,
         odl-bgpcep-pcep,
         odl-bgpcep-bgp,
-        odl-bgpcep-bmp,odl-jolokia
+        odl-bgpcep-bmp,
+        odl-jolokia
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

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: ''

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index c69ccd135bc95c667bf7ffafbdc00bca93e8446d..33d82c12e3a3518bd3b1d1378c358bd2ce4cb7f8 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -31,7 +31,9 @@
     # Features to install
     # odl-jolokia is added automatically just because this is a 3node job.
     # Netconf clustered feature is installed at runtime.
-    install-features: 'odl-netconf-ssh,odl-restconf'
+    install-features: >
+        odl-restconf,
+        odl-netconf-ssh
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 095e3a859b5a33a1f17e0f19599278c687fe1ff2..a8b8adf53776b8dfd24c4ceff3c99fcc273112c5 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -29,7 +29,9 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf,
+        odl-netconf-clustered-topology
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 5432a6e9b8405df5468ade193811b50e171b11e8..b33e0f0bede39d49d5b662c66347bb63a7c06768 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -29,7 +29,9 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf,
+        odl-netconf-clustered-topology
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 49ff93d4ebda85787cfd91571a182d11ea208309..4af4d24620fe31fa9f82f1b595a51b10d5be3007 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -257,7 +257,7 @@
               -Djenkins
               -Dstream={stream}
               -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
       # Step six: Run Karaf and verify no critical failures are present.