Removed nonexistent jobs from the system

A helium testing job was referring to a nonexistent test
plan so it was removed. Additionally the job lists needed
to be edited to remove these nonexistent jobs as well.

The reason for this change is that these nonexistent jobs
now cause "integration-distribution-test-beryllium" job to
fail.

Change-Id: I7a07d8bb579712ce3cbe43be5273182802d86973
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/jjb/controller/controller-csit-netconf-stable-helium.yaml b/jjb/controller/controller-csit-netconf-stable-helium.yaml
deleted file mode 100644 (file)
index d2d7929..0000000
--- a/jjb/controller/controller-csit-netconf-stable-helium.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- project:
-    name: controller-csit-netconf-stable-helium
-    jobs:
-        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
-
-    # The project name
-    project: 'controller'
-
-    # The functionality under test
-    functionality: 'netconf'
-
-    # Project branches
-    stream:
-        - stable-helium:
-            branch: 'stable/helium'
-
-    install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Mininet configuration, this is needed as netopeer is only available in this vm
-    mininet-image: 'rk-c-el6-mininet'
-
-    # Features to install
-    install-features: 'odl-netconf-connector-all,odl-restconf-all'
-
-    # Robot custom options
-    robot-options: '-v NETOPEER_USER:root'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 571fdd4a75bca9391c2268b781c54c4433174d54..bda824055534b2fee8e4c62080ef7bc25a621901 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,8 +18,6 @@
                 bgpcep-csit-1node-userfeatures-all-{stream},
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
-                controller-csit-1node-netconf-only-{stream},
-                controller-csit-1node-netconf-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
                 controller-csit-3node-clustering-all-{stream},
                 integration-csit-3node-basic-only-{stream},
@@ -71,8 +69,6 @@
                 bgpcep-csit-1node-userfeatures-all-{stream},
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
-                controller-csit-1node-netconf-only-{stream},
-                controller-csit-1node-netconf-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
                 controller-csit-3node-clustering-all-{stream},
                 integration-csit-3node-basic-only-{stream},
@@ -114,8 +110,6 @@
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
-                controller-csit-1node-imds-netconf-only-{stream},
-                controller-csit-1node-imds-netconf-all-{stream},
                 controller-csit-1node-imds-nsf-only-{stream},
                 controller-csit-1node-imds-nsf-all-{stream},
                 integration-csit-3node-basic-only-{stream},