removing the dynamic naming of the expected testplan

[releng/builder.git] / jjb / netvirt / netvirt-csit-3node-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index 92f393df99517e1db793b7286d767e2489e2667d..70097039be969ad86f6d6a97dc321e0907b4a24c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@ -3,40 +3,54 @@
     jobs:
         - '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
 
-    # The project name
     project: 'netvirt'
 
-    # The project name
-    functionality: 'openstack'
+    functionality:
+        - upstream-transparent:
+            schedule: 'H H * * *'
+            sg-mode: 'transparent'
+        - upstream-stateful:
+            schedule: 'H H * * *'
+            sg-mode: 'stateful'
+        - upstream-learn:
+            schedule: 'H H * * *'
+            sg-mode: 'learn'
+        - gate-transparent:
+            schedule: ''
+            sg-mode: 'transparent'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
-    install-features: 'odl-ovsdb-openstack'
-
-    schedule: 'H H * * *'
+    install-features: 'odl-netvirt-openstack'
 
     odl-enable-l3: 'yes'
 
     enable-haproxy: 'yes'
 
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
 
     tenant-network-type: 'vxlan'
+
+    security-group-mode: '{sg-mode}'
+
+    test-plan: 'netvirt-3node-openstack'