Remove integration-*-basic-* jobs

They only contain a trivial restconf test.
Both 1-node and 3-node deployments are already
better covered by project-specific csit jobs.

+ Also removed from csit-list lists.

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

diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml
deleted file mode 100644 (file)
index cfd8819..0000000
--- a/jjb/integration/integration-csit-basic.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- project:
-    name: integration-csit-basic
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
-        - '{project}-csit-verify-3node-{functionality}'
-
-    # The project name
-    project: 'integration'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        aaa-distribution-{stream},
-        integration-distribution-merge-{stream}

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 712dd226b4cd11b611c21f464c4b1c53e7387aff..e1cd5a275be1fce0aecb46ae7b18c8b1da99f6eb 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -21,7 +21,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -84,7 +83,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-offline-{stream},
                 integration-distribution-deploy-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -149,7 +147,6 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                integration-csit-3node-basic-only-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
                 l2switch-csit-1node-switch-all-{stream},