Merge "Remove all Neon 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 813abc6b5efe31ec3dc3186580a210aefe2abac9..3a39137567d124ef14e40983d667e5b7e149226e 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-magnesium
+    name: netvirt-csit-openstack-integration-aluminium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'magnesium'
+    stream: 'aluminium'
     branch: 'master'
     jre: 'openjdk11'
     testplan: '{project}-{topology}-openstack.txt'
@@ -89,13 +89,14 @@
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-sodium
+    name: netvirt-csit-openstack-integration-magnesium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
+    stream: 'magnesium'
+    branch: 'stable/magnesium'
+    jre: 'openjdk11'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -177,13 +178,13 @@
           openstack_system2_image: '{openstack_rocky_system_image}'
 
 - project:
-    name: netvirt-csit-openstack-integration-neon
+    name: netvirt-csit-openstack-integration-sodium
     jobs:
       - inttest-csit-openstack-custom
 
     project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
+    stream: 'sodium'
+    branch: 'stable/sodium'
     testplan: '{project}-{topology}-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
@@ -223,10 +224,14 @@
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
+      - dcgw:
+          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          tools_system_count: 3
+          enable-gre-type-driver: 'yes'
       # 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-driver: 'yes'
       - tempest-stateful:
@@ -247,12 +252,18 @@
           odl-snat-mode: 'conntrack'
 
     openstack:
-      - stein:
-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
+          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-1cmb-0ctl-0cmp-openstack-integration
@@ -271,13 +282,14 @@
     os-cmp-cnt: 0
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
 
     topology:
       - 1node: