Enable gre type driver for tdd wip jobs

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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 389154284727f5cf02d1edf8a214c31ed68db28c..983701b627595113fe270d0fbefeb0438d02e697 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-neon
+    name: netvirt-csit-openstack-integration-sodium
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
+    stream: 'sodium'
     branch: 'master'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
@@ -15,6 +15,7 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -45,10 +46,15 @@
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
+      - dcgw:
+          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          tools_system_count: 3
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
+          schedule: '{schedule-weekly}'
+          tools_system_count: 3
+          enable-gre-type-drivers: 'yes'
       - tempest-stateful:
           test-suites: 'openstack/tempest/tempest.robot'
           testplan: '{project}-{topology}-openstack-tempest.txt'
@@ -71,17 +77,23 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'
+      - rocky:
+          openstack-branch: 'stable/rocky'
+          odl-ml2-branch: 'stable/rocky'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_rocky_system_image}'
+          openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-fluorine
+    name: netvirt-csit-openstack-integration-neon
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'fluorine'
-    branch: 'master'
+    stream: 'neon'
+    branch: 'stable/neon'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -90,6 +102,7 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -124,6 +137,8 @@
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
+          tools_system_count: 3
+          enable-gre-type-drivers: 'yes'
       - tempest-stateful:
           test-suites: 'openstack/tempest/tempest.robot'
           testplan: '{project}-{topology}-openstack-tempest.txt'
@@ -146,17 +161,17 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-oxygen
+    name: netvirt-csit-openstack-integration-fluorine
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'oxygen'
-    branch: 'stable/oxygen'
+    stream: 'fluorine'
+    branch: 'stable/fluorine'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -165,6 +180,7 @@
     odl_system_flavor: odl-highcpu-8
     openstack_system_flavor: odl-highcpu-8
     openstack_system2_flavor: odl-highcpu-4
+    tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
     os-cmp-cnt: 2
@@ -189,16 +205,18 @@
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
       - gate-stateful-itm-direct-tunnels:
           enable-itm-direct-tunnels: 'true'
+      - gate-stateful-snat-conntrack:
+          odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
       - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
+          tools_system_count: 3
+          enable-gre-type-drivers: 'yes'
       - tempest-stateful:
           test-suites: 'openstack/tempest/tempest.robot'
           testplan: '{project}-{topology}-openstack-tempest.txt'
@@ -221,13 +239,13 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     security-group-mode: 'stateful'
@@ -256,28 +274,24 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           ovs-install: 'v2.9.2'
+      - neon:
+          branch: 'stable/neon'
+          ovs-install: 'v2.9.2'
       - fluorine:
           branch: 'stable/fluorine'
           ovs-install: 'v2.9.2'
-      - oxygen:
-          branch: 'stable/oxygen'
-          ovs-install: 'v2.6.1-nsh'
-          os-cmp-cnt: 1
-          openstack_system2_count: 1
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     testplan: '{project}-{topology}-openstack.txt'
@@ -291,12 +305,12 @@
     os-cmp-cnt: 0
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     topology:
       - 1node:
@@ -350,5 +364,5 @@
           openstack-branch: 'stable/queens'
           odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_queens_system_image}'
+          openstack_system2_image: '{openstack_queens_system_image}'