X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=9ebe2181feb475e1e0ee00a8a0a9043b88f1f862;hb=fadf64df66046bffd7993d0ee6ff220e6c976254;hp=a2c8c6d345bc9a59b65f0b778be6b4ae905875da;hpb=29b2f25826a1d889aa515be1c39c40da83f7ae00;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index a2c8c6d34..9ebe2181f 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,20 +1,20 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration
+    name: netvirt-csit-openstack-integration-oxygen
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
+    stream: 'oxygen'
+    branch: 'master'
 
     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
           odl_system_count: 3
           enable-haproxy: 'yes'
@@ -23,76 +23,170 @@
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-      - upstream-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-learn:
-          schedule: ''
-          sg-mode: 'learn'
-      - gate-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
-      - gate-minimal-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
+      - gate-stateful-snat-conntrack:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
-      - gate-tempest-transparent:
-          schedule: ''
-          sg-mode: 'transparent'
-          testplan: '{project}-{topology}-tempest-openstack.txt'
 
-    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
+    openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+      - 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 - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-openstack-integration-nitrogen
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+    stream: 'nitrogen'
+    branch: 'stable/nitrogen'
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-stateful:
+          sg-mode: 'stateful'
+      - gate-stateful-snat-conntrack:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-minimal-cluster:
+          sg-mode: 'stateful'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+
+    openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+      - 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 - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: '{sg-mode}'
+
+- project:
+    name: netvirt-csit-openstack-integration-carbon
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'netvirt'
+    stream: 'carbon'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system2_count: 3
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - upstream-stateful:
+          sg-mode: 'stateful'
+      - upstream-stateful-snat-conntrack:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
+      - gate-stateful:
+          sg-mode: 'stateful'
+      - gate-stateful-snat-conntrack:
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
 
     openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-          openstack_system2_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'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
 
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,tempest'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
 
 - project:
-    name: netvirt-csit-extensions-site-openstack-integration
+    name: netvirt-csit-sfc-openstack-integration
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
@@ -100,32 +194,34 @@
 
     topology:
       - 1node:
-          openstack_system_count: 1
           openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-sfc'
 
     functionality:
-      - extensions-sfc:
-          schedule: ''
+      - sfc:
+          enable-openstack-services: 'placement-api,tempest'
+          enable-openstack-compute-services: 'placement-client'
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     openstack:
-      - 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'
+          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
+          odl-ml2-branch: 'stable/pike'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
 
     security-group-mode: 'stateful'