X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-1node-openstack.yaml;h=1f598940fa10007d71bf9f95bbc4568bdaad8b16;hb=28f92191d9d3d96522e12b5ae1e4e680e5a41352;hp=ad89232ddb62dbd44ff1d265ac458b8844fcbb64;hpb=7249f71cdaed3cd57246123bf36eb8329c999cfb;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index ad89232dd..1f598940f 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -1,51 +1,53 @@
+---
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-        - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
     # The project name
     project: 'groupbasedpolicy'
-    testplan: '{project}-1node-openstack.txt'
+
+    topology:
+      - 1node:
+          openstack_system_count: 1
+          odl_system_count: 1
+          enable-haproxy: 'no'
+
+    testplan: '{project}-{topology}-openstack.txt'
 
     # The project name
     functionality: 'openstack'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-            install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          karaf-version: karaf3
+          install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf'
 
     openstack:
-        - mitaka:
-            openstack-branch: 'stable/mitaka'
-            odl-ml2-branch: 'stable/mitaka'
-            odl-ml2-driver-version: 'v1'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-branch: 'stable/liberty'
-            odl-ml2-driver-version: 'v1'
+      - newton:
+          openstack-branch: 'stable/newton'
+          odl-ml2-branch: 'stable/newton'
 
     schedule: 'H H * * *'
 
-    odl-enable-l3: 'yes'
-
     public-bridge: 'br-int'
 
-    enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
-    disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'
-
-    tenant-network-type: 'vxlan'
+    enable-openstack-plugins: 'networking-odl'
 
     security-group-mode: 'none'
-
-    robot-options: ''