Controller 3node: jolokia instead of netconf-connector

Netconf-connector is not compatible with cluster:
https://wiki.opendaylight.org/view/Integration/Test/Cluster_Incompatible_Features#odl-netconf-connector
List of trigger jobs remains unchanged,
as the suite is still sensitive to changes in restconf.

Feature odl-jolokia has beed added, as that is the preferred way
to install jolokia into ODL.

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

diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
index 04de420ba88d30e86b35e1e40ccd1dc5e8838706..8b9dabcf391aebcfba1e3e0531d3a65518dd0314 100644 (file)
--- a/jjb/controller/controller-csit-clustering-lithium.yaml
+++ b/jjb/controller/controller-csit-clustering-lithium.yaml
@@ -21,7 +21,7 @@
         # Bug 4676 means -all- would fail.
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    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 92e9877016ec91c03ebc45a8f3482400666005e3..68fc79d3732fd18ee58a017a00a303e2a6e67d63 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     robot-options: ''