Merge "enable driver_type gre and ml2_gre"

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

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 27e67e78fc50d2af8deb6668d1946ad5294c0998..ef92697ecbff63d92955bc83e228d88e77099aa6 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -74,6 +74,7 @@
     os-ctl-cnt: 0
     os-cmp-cnt: 0
     os-std-topo: '0cmb-1ctl-2cmp'
+    ovs-install: ''
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -97,7 +98,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180723-235456.035
     odl_system_count: 1
     odl_system_flavor: odl-highcpu-4
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180802-220823.782
+    odl_system_image: ZZCI - CentOS 7 - builder - x86_64 - 20180823-152917.621
     openstack_system_count: 1
     openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20180723-235345.727
@@ -201,16 +202,30 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-neon: >
+        netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon
     csit-high-frequency-list-fluorine: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine
     csit-high-frequency-list-oxygen: >
         netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen
+    csit-sanity-list-neon: >
+        openflowplugin-csit-1node-sanity-only-neon,
+        distribution-sanity-neon
     csit-sanity-list-fluorine: >
         openflowplugin-csit-1node-sanity-only-fluorine,
         distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
         openflowplugin-csit-1node-sanity-only-oxygen,
         distribution-sanity-oxygen
+    csit-weekly-list-neon: >
+        controller-csit-1node-notifications-longevity-only-neon,
+        controller-csit-3node-drb-partnheal-longevity-only-neon,
+        controller-csit-3node-drb-precedence-longevity-only-neon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-neon,
+        bgpcep-csit-3node-bgpclustering-longevity-only-neon,
+        distribution-deploy-neon,
+        distribution-offline-neon,
+        openflowplugin-csit-1node-longevity-only-neon
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,