X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=828cb44ab7163163a1abbe26ac3133621c5d4b17;hb=992a94ba358a92a4ed9348f9e3b050a7d43739a2;hp=06abe2c24419ffe9a5b39239f94612778e4e7349;hpb=a5b35b7ccc82271457cf456ffd0ea2f0104e73a8;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 06abe2c24..828cb44ab 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,19 +1,24 @@
 ---
 - project:
-    name: netvirt-csit-hwvtep-openstack-integration
+    name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
       - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
+    stream: 'oxygen'
+    branch: 'master'
+    jre: 'openjdk8'
 
     topology:
       - 1node:
-          openstack_system_count: 3
+          openstack_system1_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system_count: 4
+          openstack_system1_count: 1
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -21,49 +26,163 @@
     testplan: '{project}-{topology}-l2gw-openstack.txt'
 
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
-      - upstream-learn:
+      - gate-stateful:
+          sg-mode: 'stateful'
+
+    openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+      - queens:
+          openstack-branch: 'master'
+          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
+          odl-ml2-branch: 'master'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
+    tools_system_count: 2
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
+
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
+    jobs:
+      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
+    jre: 'openjdk8'
+
+    topology:
+      - 1node:
+          openstack_system1_count: 1
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system1_count: 1
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
           schedule: ''
-          sg-mode: 'learn'
+          sg-mode: 'stateful'
       - gate-stateful:
           schedule: ''
           sg-mode: 'stateful'
 
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170609-0220'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+      - queens:
+          openstack-branch: 'master'
+          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
+          odl-ml2-branch: 'master'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
 
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
     tools_system_count: 2
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
-
+    # 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'
+- project:
+    name: netvirt-csit-hwvtep-openstack-integration-carbon
+    jobs:
+      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
+    project: 'netvirt'
+
+    stream: 'carbon'
+    branch: 'stable/carbon'
+    jre: 'openjdk8'
+    karaf-version: karaf3
+
+    topology:
+      - 1node:
+          openstack_system1_count: 1
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system1_count: 1
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+      - gate-stateful:
+          schedule: ''
+          sg-mode: 'stateful'
+
+    openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+      - pike:
+          openstack-branch: 'stable/pike'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
+    tools_system_count: 2
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20170829-0548'
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'