Removing imds jobs in master branch as Master has cluster by default

Change-Id: I16611be06e96181f3cfc2af10d25da3560ec295a
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-csit-basic-master.yaml b/jjb/integration/integration-csit-basic-master.yaml
index b2735ddba9749348aae808faa11eff6061626578..7d320e8a93a8d988048f8196fa3d2e16ff4174e5 100644 (file)
--- a/jjb/integration/integration-csit-basic-master.yaml
+++ b/jjb/integration/integration-csit-basic-master.yaml
@@ -1,7 +1,6 @@
 - project:
     name: integration-csit-basic-master
     jobs:
-        - '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
 

diff --git a/jjb/integration/integration-jobs.yaml b/jjb/integration/integration-jobs.yaml
index c0f24b65779de4cd4939b4514c4b6982db4fcac5..93093df1394688f2a124458dde4573854efc3e58 100644 (file)
--- a/jjb/integration/integration-jobs.yaml
+++ b/jjb/integration/integration-jobs.yaml
@@ -12,7 +12,7 @@
     stream:
         - master:
             branch: 'master'
-            csit-list: 'aaa-csit-1node-imds-authn-only-{stream},aaa-csit-1node-imds-authn-all-{stream},openflowplugin-csit-1node-imds-flow-services-only-{stream},openflowplugin-csit-1node-imds-flow-services-all-{stream},l2switch-csit-1node-imds-switch-only-{stream},l2switch-csit-1node-imds-switch-all-{stream},vtn-csit-1node-imds-manager-only-{stream},vtn-csit-1node-imds-manager-all-{stream},lispflowmapping-csit-1node-imds-all-only-{stream},lispflowmapping-csit-1node-imds-all-all-{stream}'
+            csit-list: 'aaa-csit-1node-cds-authn-only-{stream},aaa-csit-1node-cds-authn-all-{stream},openflowplugin-csit-1node-cds-flow-services-only-{stream},openflowplugin-csit-1node-cds-flow-services-all-{stream},l2switch-csit-1node-cds-switch-only-{stream},l2switch-csit-1node-cds-switch-all-{stream},vtn-csit-1node-cds-manager-only-{stream},vtn-csit-1node-cds-manager-all-{stream},lispflowmapping-csit-1node-cds-all-only-{stream},lispflowmapping-csit-1node-cds-all-all-{stream}'
 
         - stable-helium:
             branch: 'stable/helium'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f1d8363f8760709c00c38e34f40bc0dc88bbafc0..e8a07250d95f25907a84856c60b75d7bcaf13848 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -220,7 +220,7 @@
         - integration-controller-scope:
             controller-scope: '{scope}'
         - integration-controller-features:
-            controller-features: 'odl-mdsal-clustering,{install-features}'
+            controller-features: '{install-features}'
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-test-plan: