X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=a4143f9aadb75bd3cb74871bda3039fb0ff3b411;hb=c4f5571795775e56ec9bef76c40247c4c34cd755;hp=83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f;hpb=e9379cbbf67ee9f58a24e437782d92534d8b5449;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 83d25690b..86cf45cc6 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,68 +1,106 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration
+    name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
+    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: 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
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system_count: 1
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system_count: 1
-          openstack_system2_count: 3
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-      - gate-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-
-    stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          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 - 20170808-0528'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          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}'
 
-    tools_system_count: 2
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-oxygen
+    jobs:
+      - inttest-csit-hwvtep-openstack
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
+    project: 'netvirt'
+    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: 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
 
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin'
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 2
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    security-group-mode: '{sg-mode}'
+    functionality:
+      - upstream-stateful
+      - gate-stateful
+
+    openstack:
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          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}'