Merge "Trigger verify on commit-message-only changes"

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 53f4e54f59ac02b1c91d7be6390c7aaff37faddd..e32fc648e0730cc9092bc4b1b5fda7a47bc6b1ba 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -34,7 +34,7 @@
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-onem2mall-iotdm'
+    install-features: 'odl-iotdmcsitdist'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index ad040da7bbcaaf3aa1666410e95e8749a5d98000..843129a33e57bc038c29a1b524949dd4056b51e1 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -293,7 +293,6 @@
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-carbon,
         openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-carbon,
-        ovsdb-csit-1node-periodic-scalability-daily-only-carbon,
         ovsdb-csit-1node-upstream-southbound-all-carbon,
         ovsdb-csit-1node-upstream-southbound-only-carbon,
         ovsdb-csit-3node-upstream-clustering-only-carbon,
@@ -496,7 +495,6 @@
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-boron,
         openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-boron,
-        ovsdb-csit-1node-periodic-scalability-daily-only-boron,
         ovsdb-csit-1node-upstream-southbound-all-boron,
         ovsdb-csit-1node-upstream-southbound-only-boron,
         ovsdb-csit-3node-upstream-clustering-only-boron,
@@ -644,7 +642,6 @@
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-beryllium,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-perf-daily-only-beryllium,
         openflowplugin-csit-3node-periodic-restconf-clustering-perf-daily-only-beryllium,
-        ovsdb-csit-1node-periodic-scalability-daily-only-beryllium,
         ovsdb-csit-1node-upstream-southbound-all-beryllium,
         ovsdb-csit-1node-upstream-southbound-only-beryllium,
         ovsdb-csit-3node-upstream-clustering-only-beryllium,