Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Don't allow retry to fail stacking"
[releng/builder.git]
/
jjb
/
releng-defaults.yaml
diff --git
a/jjb/releng-defaults.yaml
b/jjb/releng-defaults.yaml
index 48e947e807b096f90092d63a1fafd6f595445955..839171392d4c6e3aafd6d74621483c6b688abd56 100644
(file)
--- a/
jjb/releng-defaults.yaml
+++ b/
jjb/releng-defaults.yaml
@@
-3,6
+3,7
@@
- defaults:
name: global
- defaults:
name: global
+ prefix: '' # A prefix for job names sandbox for example: user-
karaf-version: karaf4
build-days-to-keep: 30
karaf-version: karaf4
build-days-to-keep: 30
@@
-10,7
+11,7
@@
# Timeout in minutes
build-timeout: 360
# Timeout in minutes
build-timeout: 360
- build-node: centos7-builder-
2c-8
g
+ build-node: centos7-builder-
4c-4
g
schedule: ''
schedule-saturday: 'H H * * 6'
schedule-weekly: 'H 23 * * 6'
schedule: ''
schedule-saturday: 'H H * * 6'
schedule-weekly: 'H 23 * * 6'
@@
-43,6
+44,7
@@
enable-openstack-plugins: 'networking-odl'
enable-openstack-services: ''
enable-openstack-compute-services: ''
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
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'
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: ''
# openstack-infra-parameters defaults
archive-artifacts: ''
@@
-71,19
+74,19
@@
openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
stack-template: csit-2-instance-type.yaml
docker_system_count: 1
openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
stack-template: csit-2-instance-type.yaml
docker_system_count: 1
- docker_system_flavor: v
1-performance
-1
+ docker_system_flavor: v
2-standard
-1
docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
odl_system_count: 1
docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
odl_system_count: 1
- odl_system_flavor: v
1-performance-2
- odl_system_image: ZZCI - CentOS 7 - builder - 20180
109-0417
+ odl_system_flavor: v
2-highcpu-4
+ odl_system_image: ZZCI - CentOS 7 - builder - 20180
201-2139
openstack_system_count: 1
openstack_system_count: 1
- openstack_system_flavor: v
1-performance
-4
+ openstack_system_flavor: v
2-standard
-4
openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
openstack_system2_count: 0
openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
openstack_system2_count: 0
- openstack_system2_flavor: v
1-performance
-1
+ openstack_system2_flavor: v
2-standard
-1
openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
tools_system_count: 1
openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
tools_system_count: 1
- tools_system_flavor: v
1-performance-1
+ tools_system_flavor: v
2-highcpu-2
tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Default Robot framework options
tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
# Default Robot framework options
@@
-103,7
+106,6
@@
# Maven / Java
java-version: 'openjdk8'
jre: 'openjdk8'
# Maven / Java
java-version: 'openjdk8'
jre: 'openjdk8'
- jdk: 'openjdk8'
opendaylight-infra-mvn-opts: |
--show-version
--batch-mode
opendaylight-infra-mvn-opts: |
--show-version
--batch-mode