X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn-manager-csit-1node-openstack.yaml;h=78eb46f0af469630509e23ae88bf40c6767dce64;hb=e687c906e19c8800e5ec96ff65f0af06ce5cd0a2;hp=87f0a00b619b056300ab2c482c8e43fc6ae2c34a;hpb=91edb2959bb6308c40cf6069c75be2163b37002c;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 87f0a00b6..78eb46f0a 100644
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -1,38 +1,48 @@
+---
 - project:
     name: vtn-manager-csit-openstack-integration
     jobs:
-        - '{project}-csit-1node-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'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
     # The project name
     functionality: 'neutron'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
 
     openstack:
-        - mitaka:
-            openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
-
-    openstack-vms: 1
+      - 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'
 
-    install-features: 'odl-vtn-manager-neutron,odl-restconf-all'
-
-    schedule: 'H H * * *'
+    schedule: ''
 
     odl-enable-l3: 'no'
 
@@ -43,3 +53,13 @@
     disable-openstack-services: 'n-net,q-l3'
 
     tenant-network-type: 'local'
+
+    public-physical-network: 'physnet1'
+
+    enable-networking-l2gw: 'no'
+
+    disable-odl-l3-service-plugin: 'no'
+
+    security-group-mode: 'none'
+
+    robot-options: ''