Merge "Adjust netconf cluster suites"

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
deleted file mode 100644 (file)
index c2dbc53..0000000
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
-    name: netconf-csit-cluster-stress
-    jobs:
-      - inttest-csit-3node
-
-    # The project name
-    project: 'netconf'
-
-    # The functionality under test
-    functionality: 'cluster-stress'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-jolokia,
-        odl-netconf-clustered-topology
-
-    # Robot custom options
-    # TODO: Make sure every suite has this as default, then remove this value from here.
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 18da27dc561db0f1efee8be8d9c8f9b1d98cce90..7652b068fb23f96001147d23bbee74f793fae30d 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -20,8 +20,8 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     # Features to install
     install-features: >

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 1aa626f0a79d32079fedc4e71af20ba27cd57bd3..85766f77d4235bb6ceee02633e9bb1de3e63e6a7 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -20,8 +20,8 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     # Features to install
     install-features: >