Override csit verify stream for bier

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

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4eff8b5ccfd6e79ca8a5c433423183bfea1523bc..47e189bebfaa9266f55738641536f9933fca87bd 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,6 +9,7 @@
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-java-builder-2c-8g
+    num-openstack-sites: 1
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
@@ -17,6 +18,7 @@
     devstack-lbaas-plugin-repo: 'https://github.com/openstack/neutron-lbaas'
     server-name: 'OpenDaylight'
     git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
+    ipsec-vxlan-tunnels-enabled: 'no'
 
     public-bridge: 'br-physnet1'
     public-physical-network: 'physnet1'
@@ -49,7 +51,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
@@ -138,11 +140,26 @@
     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,
+        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
-    csit-list-blacklist: 'longevity gate'
+    # 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,
@@ -242,6 +259,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,
@@ -298,7 +319,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,
@@ -354,8 +374,6 @@
         vtn-csit-3node-manager-all-carbon,
         vtn-csit-3node-manager-only-carbon,
         yangtools-csit-1node-periodic-system-only-carbon
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon
     csit-list-boron: >
         aaa-csit-1node-authn-all-boron,
         aaa-csit-1node-authn-only-boron,
@@ -446,6 +464,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,
@@ -502,7 +524,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,