X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=452244ef3f3f7cae7f0280621f21ba7210b7b1ef;hb=0db52081cc723d56af089d057c041f732330e4b6;hp=2ec9371d4fa8f53e8386f4e9d27cdd1e44435ea1;hpb=c834b9b47899de1e299a39b26389670ac34199b1;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 2ec9371d4..452244ef3 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,81 +1,88 @@
+---
 - project:
     name: netvirt-csit-openstack-integration
     jobs:
-        - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     project: 'netvirt'
 
     topology:
-        - 1node:
-            openstack_system_count: 3
-            odl_system_count: 1
-            enable-haproxy: 'no'
-            install-features: 'odl-netvirt-openstack'
-        - 3node:
-            openstack_system_count: 4
-            odl_system_count: 3
-            enable-haproxy: 'yes'
-            install-features: 'odl-jolokia,odl-netvirt-openstack'
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     testplan: '{project}-{topology}-openstack.txt'
 
     functionality:
-        - upstream-transparent:
-            schedule: 'H H/4 * * *'
-            sg-mode: 'transparent'
-        - upstream-stateful:
-            schedule: ''
-            sg-mode: 'stateful'
-        - 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'
-            testplan: '{project}-{topology}-minimal-openstack.txt'
-        - gate-tempest-transparent:
-            schedule: ''
-            sg-mode: 'transparent'
-            testplan: '{project}-{topology}-tempest-openstack.txt'
+      - upstream-transparent:
+          schedule: 'H H/4 * * *'
+          sg-mode: 'transparent'
+      - upstream-stateful:
+          schedule: 'H H * * *'
+          sg-mode: 'stateful'
+      - upstream-learn:
+          schedule: 'H H * * *'
+          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'
+          testplan: '{project}-{topology}-minimal-openstack.txt'
+      - gate-tempest-transparent:
+          schedule: ''
+          sg-mode: 'transparent'
+          testplan: '{project}-{topology}-tempest-openstack.txt'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
 
     openstack:
-        - mitaka:
-            openstack-branch: 'stable/mitaka'
-            odl-ml2-branch: 'stable/mitaka'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170130-0523'
-        - newton:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
-        - newton-nodl-v2:
-            openstack-branch: 'stable/newton'
-            odl-ml2-branch: 'stable/newton'
-            odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack-newton - 20170130-0426'
+      - mitaka:
+          openstack-branch: 'stable/mitaka'
+          odl-ml2-branch: 'stable/mitaka'
+          odl-ml2-driver-version: 'v1'
+          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v1'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
+      - newton-nodl-v2:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344'
 
     odl-enable-l3: 'yes'
 
     public-bridge: 'br-physnet1'
 
+    public-physical-network: 'physnet1'
+
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 
     disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'