Merge changes from topic 'cleanup-maven'

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 48e947e807b096f90092d63a1fafd6f595445955..63872f8558a8377797d55fca170de084ba77d680 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -3,6 +3,7 @@
 
 - defaults:
     name: global
+    prefix: ''  # A prefix for job names sandbox for example: user-
 
     karaf-version: karaf4
     build-days-to-keep: 30
@@ -43,6 +44,7 @@
     enable-openstack-plugins: 'networking-odl'
     enable-openstack-services: ''
     enable-openstack-compute-services: ''
+    enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1
@@ -55,6 +57,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''
@@ -75,7 +78,7 @@
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
     odl_system_flavor: v1-performance-2
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180109-0417
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
     openstack_system_flavor: v1-performance-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648