Combine SFC clustering jobs into SFC Rest Basic to reduce number of jenkins

It removes sfc clustering templates. Note this commit is related to
a similar one in integration/test repository to do the actual merge
of test suites from sfc_clustering into sfc_rest_basic.

With this operation it is expected to reduce eight jenkins jobs in SFC project

Change-Id: Ia160f04629d908c132e4d398fe2652f759d9dee3
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>

diff --git a/jjb/sfc/sfc-csit-clustering-lithium.yaml b/jjb/sfc/sfc-csit-clustering-lithium.yaml
deleted file mode 100644 (file)
index 03145a6..0000000
--- a/jjb/sfc/sfc-csit-clustering-lithium.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: sfc-csit-clustering-lithium
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-
-    # The project name
-    project: 'sfc'
-
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
-    stream:
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-sfc-core,odl-restconf-all'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'lispflowmapping-distribution-{stream},ovsdb-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
deleted file mode 100644 (file)
index a5694ea..0000000
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: sfc-csit-clustering
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-
-    # The project name
-    project: 'sfc'
-
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-sfc-provider-rest'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'lispflowmapping-distribution-{stream},ovsdb-distribution-{stream},openflowplugin-distribution-{stream}'