Merge "Make docs-verify-rtd job only run against changes to rst files"

[releng/builder.git] / jjb / netvirt / netvirt-vpnservice-csit-1node-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index 73a3b271c92973bb46dc2df11ea755caefd26bbe..f5af75c7727731b48fee4b2ada0d04ba5a95a2c7 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -10,9 +10,12 @@
     functionality: 'openstack'
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
 
     openstack:
         - mitaka:
@@ -30,8 +33,12 @@
 
     odl-enable-l3: 'yes'
 
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
+
     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'
+
+    security-group-mode: 'transparent'