Merge "Replace ubuntu_mininet with updated label"

[releng/builder.git] / jjb / vtn / vtn-manager-csit-1node-openstack.yaml

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 8f0409884635720521d03cee2e18af514a07d735..5561c0882ff8f1a3f5aaf4f533e8652576905b81 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -1,18 +1,30 @@
 - 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:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -20,16 +32,14 @@
     openstack:
         - mitaka:
             openstack-branch: 'stable/mitaka'
-            odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+            odl-ml2-branch: 'stable/mitaka'
+            odl-ml2-driver-version: 'v1'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-branch: 'master'
+            odl-ml2-driver-version: 'v1'
 
-    openstack-vms: 1
-
-    install-features: 'odl-vtn-manager-neutron,odl-restconf-all'
-
-    schedule: 'H H * * *'
+    schedule: ''
 
     odl-enable-l3: 'no'
 
@@ -40,3 +50,9 @@
     disable-openstack-services: 'n-net,q-l3'
 
     tenant-network-type: 'local'
+
+    public-physical-network: 'physnet1'
+
+    security-group-mode: 'none'
+
+    robot-options: ''