X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn-manager-csit-1node-openstack.yaml;h=1aca07d541b4c2b4cd9d7e90d7a16aa37d285c91;hb=9b46087a28de418cf2e0ce5d366346dc9adc3a10;hp=65bce594ee406834a1d7bc2643bc36f31ce033ee;hpb=975d7ea070a613a590cd93da9a5828cae812bf6e;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 65bce594e..1aca07d54 100644
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -1,17 +1,18 @@
+---
 - project:
     name: vtn-manager-csit-openstack-integration
     jobs:
-        - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
     project: 'vtn'
 
     topology:
-        - 1node:
-            openstack_system_count: 1
-            odl_system_count: 1
-            enable-haproxy: 'no'
-            install-features: 'odl-vtn-manager-neutron,odl-restconf-all'
+      - 1node:
+          openstack_system_count: 1
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-vtn-manager-neutron,odl-restconf-all'
 
     testplan: '{project}-{topology}-openstack.txt'
 
@@ -19,29 +20,22 @@
     functionality: 'neutron'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     openstack:
-        - 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'
-
-    schedule: ''
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     odl-enable-l3: 'no'
 
@@ -52,9 +46,3 @@
     disable-openstack-services: 'n-net,q-l3'
 
     tenant-network-type: 'local'
-
-    public-physical-network: 'physnet1'
-
-    security-group-mode: 'none'
-
-    robot-options: ''