X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvtn%2Fvtn-manager-csit-1node-openstack.yaml;h=512ac50c28cc6e564e8f1ae5194ccfb6f1e18f0a;hb=f93289b1fc422b77fcd00cfebe848c4eac982284;hp=960e64f6d68bce1771212395b8939358a2836331;hpb=c6f00ee8cff337ee1124f4aa7433d44058bffc45;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 960e64f6d..512ac50c2 100644
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -2,7 +2,7 @@
 - project:
     name: vtn-manager-csit-openstack-integration
     jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-openstack
 
     # The project name
     project: 'vtn'
@@ -20,34 +20,28 @@
     functionality: 'neutron'
 
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
-
-    schedule: ''
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-services: 'n-cpu,placement-api,placement-client,tempest'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+          odl-ml2-port-binding: 'legacy-port-binding'
 
     odl-enable-l3: 'no'
-
     public-bridge: 'br-ex'
-
-    enable-openstack-services: 'n-cpu,q-agt,q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
     disable-openstack-services: 'n-net,q-l3'
-
     tenant-network-type: 'local'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    odl-ml2-driver-version: 'v2'