Merge "To enable odl_l3 and l2gw feature work together"

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index f69f5eac1a08cc44e23910a7cccb1e5fc1e4259a..456f8b959f690a2304b45c4c196502b1c4f913a2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -50,7 +50,7 @@
     docker_system_image: CentOS 7 - docker - 20170120-1434
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170126-0058
+    odl_system_image: CentOS 7 - java-builder - 20170311-0517
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20170221-1719
@@ -139,11 +139,28 @@
     10-inclusion-flag: 'off'
     10-exclude-value: ''
 
+    # Manual CSIT job lists used by sanity
+    # and weekly distribution test jobs
+    csit-sanity-list-carbon: >
+        openflowplugin-csit-1node-sanity-only-carbon
+    csit-sanity-list-boron: >
+        openflowplugin-csit-1node-sanity-only-boron
+    csit-weekly-list-carbon: >
+        controller-csit-1node-notifications-longevity-only-carbon,
+        controller-csit-3node-drb-partnheal-longevity-only-carbon,
+        controller-csit-3node-drb-precedence-longevity-only-carbon,
+        openflowplugin-csit-1node-periodic-longevity-only-carbon
+    csit-weekly-list-boron: >
+        openflowplugin-csit-1node-periodic-longevity-only-boron
+
     # CSIT Test List Variables
-    # Space seperated strings to exclude from CSIT lists
+    # Space seperated strings to exclude from
+    # auto generated CSIT job lists
     csit-list-blacklist: 'longevity gate sanity'
+
     # Auto Generated CSIT job lists used
-    # in integration-distribution-test jobs
+    # in regular distribution test jobs
+    # DO NOT EDIT NEXT LINES MANUALLY
     csit-list-carbon: >
         aaa-csit-1node-authn-all-carbon,
         aaa-csit-1node-authn-only-carbon,
@@ -243,6 +260,10 @@
         netvirt-csit-1node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
@@ -270,15 +291,6 @@
         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,
-        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-carbon,
-        netvirt-legacy-csit-1node-openstack-newton-upstream-carbon,
-        netvirt-legacy-csit-3node-clustering-only-carbon,
-        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,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
         nic-csit-1node-vtnrenderer-all-carbon,
@@ -299,7 +311,6 @@
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-carbon,
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-carbon,
         openflowplugin-csit-1node-periodic-sw-scalability-daily-only-carbon,
-        openflowplugin-csit-1node-sanity-only-carbon,
         openflowplugin-csit-1node-scalability-only-carbon,
         openflowplugin-csit-3node-clustering-only-carbon,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
@@ -355,11 +366,6 @@
         vtn-csit-3node-manager-all-carbon,
         vtn-csit-3node-manager-only-carbon,
         yangtools-csit-1node-periodic-system-only-carbon
-    csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
     csit-list-boron: >
         aaa-csit-1node-authn-all-boron,
         aaa-csit-1node-authn-only-boron,
@@ -450,6 +456,10 @@
         netvirt-csit-1node-openstack-newton-upstream-learn-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
@@ -506,7 +516,6 @@
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-boron,
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-boron,
         openflowplugin-csit-1node-periodic-sw-scalability-daily-only-boron,
-        openflowplugin-csit-1node-sanity-only-boron,
         openflowplugin-csit-1node-scalability-only-boron,
         openflowplugin-csit-3node-clustering-only-boron,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron,
@@ -556,10 +565,6 @@
         vtn-csit-1node-openstack-newton-neutron-boron,
         vtn-csit-3node-manager-all-boron,
         vtn-csit-3node-manager-only-boron
-    csit-sanity-list-boron: >
-        openflowplugin-csit-1node-sanity-only-boron
-    csit-weekly-list-boron: >
-        openflowplugin-csit-1node-periodic-longevity-only-boron
     csit-list-beryllium: >
         aaa-csit-1node-authn-all-beryllium,
         aaa-csit-1node-authn-only-beryllium,