Merge "Disable stateful and learn modes for L2GW CSIT"

[releng/builder.git] / jjb / netvirt / netvirt-csit-hwvtep-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index c9ec664e3008132a816160b97b1e2f1a00961520..83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -26,20 +26,17 @@
       - upstream-transparent:
           schedule: ''
           sg-mode: 'transparent'
-      - upstream-stateful:
+      - gate-transparent:
           schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+          sg-mode: 'transparent'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -53,12 +50,12 @@
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     tools_system_count: 2