Merge "Remove federation carbon jobs"

[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 88d6a4a42c16308ab5470d94b29a77319d9122b0..e2130df801e0a5a66ab096f2913636e7aeb848ab 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,20 +1,20 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
       - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-    stream: 'oxygen'
+    stream: 'fluorine'
     branch: 'master'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -38,12 +38,6 @@
       - gate-stateful
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
@@ -52,28 +46,28 @@
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
+    name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
       - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
+    stream: 'oxygen'
+    branch: 'stable/oxygen'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -97,12 +91,6 @@
       - gate-stateful
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
@@ -111,29 +99,28 @@
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - queens:
-          openstack-branch: 'master'
-          odl-ml2-branch: 'master'
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration-carbon
+    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
     jobs:
       - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
     testplan: '{project}-{topology}-l2gw-openstack.txt'
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -157,12 +144,6 @@
       - gate-stateful
 
     openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
       - pike:
           openstack-branch: 'stable/pike'
           odl-ml2-branch: 'stable/pike'
@@ -170,3 +151,9 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'