Merge "Call csit directly from patch test jobs"

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 8fa62680b3d60f727eb5d17adf6ee94bb26b6622..d9ec1cc938c36e465b1e75ed930f5f67c25e89c8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -33,7 +33,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -90,7 +89,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
@@ -147,7 +145,6 @@
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
                 openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
-                openflowplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 3375f6578c06a4f0b32b96e543dba28ca54c0889..77692ee60c6c75503c4d58e120ad1a2d2a27e44f 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-openflowplugin-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'