From 9fc2708ceb98a96eb1a24b6c331186903519e534 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 13 Nov 2018 16:23:56 -0800
Subject: [PATCH] Adjust netconf cluster suites

- Cluster test -only- feature.
- Stress python script does not seem to work well
so better remove test for now.

Change-Id: Ibba00ec63ab1290a531c27541a78e41de8bae58f
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 jjb/netconf/netconf-cluster-stress.yaml   | 34 -----------------------
 jjb/netconf/netconf-clustering-scale.yaml |  4 +--
 jjb/netconf/netconf-clustering.yaml       |  4 +--
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 jjb/netconf/netconf-cluster-stress.yaml

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
deleted file mode 100644
index c2dbc5320..000000000
--- 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 18da27dc5..7652b068f 100644
--- 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 1aa626f0a..85766f77d 100644
--- 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: >
-- 
2.36.6