Merge "Replace ubuntu_mininet with updated label"

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 80b4a14462cba0642ea1d7ba4c1111b5cbe342eb..396b1e5e169a569d94f8218e7c4c82e22b031674 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -31,10 +31,10 @@
     odl_system_image: CentOS 7 - java-builder - 20170126-0058
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
-    openstack_system_image: CentOS 7 - devstack - 20170120-1710
+    openstack_system_image: CentOS 7 - devstack - 20170210-1356
     tools_system_count: 1
     tools_system_flavor: 2 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet - 20170130-0425
+    tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439
 
     # Default Robot framework options
     robot-options: ''
@@ -218,6 +218,24 @@
         netvirt-csit-3node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-learn-carbon,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
         netvirt-legacy-csit-1node-openstack-basic-all-carbon,
         netvirt-legacy-csit-1node-openstack-basic-only-carbon,
         netvirt-legacy-csit-1node-openstack-mitaka-upstream-carbon,
@@ -227,24 +245,6 @@
         netvirt-legacy-csit-3node-openstack-mitaka-upstream-carbon,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-carbon,
         netvirt-legacy-csit-3node-openstack-newton-upstream-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
         nic-csit-1node-vtnrenderer-all-carbon,
@@ -421,6 +421,24 @@
         netvirt-csit-3node-openstack-newton-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-boron,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-learn-boron,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-boron,
+        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
+        netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
         netvirt-legacy-csit-1node-openstack-basic-all-boron,
         netvirt-legacy-csit-1node-openstack-basic-only-boron,
         netvirt-legacy-csit-1node-openstack-mitaka-upstream-boron,
@@ -430,24 +448,6 @@
         netvirt-legacy-csit-3node-openstack-mitaka-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-upstream-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-learn-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-stateful-boron,
-        netvirt-vpnservices-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
         nic-csit-1node-basic-all-boron,
         nic-csit-1node-basic-only-boron,
         nic-csit-1node-vtnrenderer-all-boron,