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 "Update to global-jjb v0.22.1"
[releng/builder.git]
/
jjb
/
defaults.yaml
diff --git
a/jjb/defaults.yaml
b/jjb/defaults.yaml
index 51f4a01763728c4832043840b109d45ad222ae2e..6d6f192dd579354956ffacb41dc8b9f45d63fbc2 100644
(file)
--- a/
jjb/defaults.yaml
+++ b/
jjb/defaults.yaml
@@
-3,8
+3,14
@@
- defaults:
name: global
- defaults:
name: global
+ functionality: global
+ stream: global
prefix: '' # A prefix for job names sandbox for example: user-
prefix: '' # A prefix for job names sandbox for example: user-
+ scriptplan: '{project}.txt'
+ configplan: '{project}.txt'
+ testplan: '{project}-{functionality}.txt'
+ streamtestplan: '{project}-{functionality}-{stream}.txt'
karaf-version: karaf4
build-days-to-keep: 30
use-features-boot: 'True'
karaf-version: karaf4
build-days-to-keep: 30
use-features-boot: 'True'
@@
-26,7
+32,7
@@
devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
# lf-infra defaults
devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
# lf-infra defaults
- jenkins-ssh-credential:
opendaylight-
jenkins-ssh
+ jenkins-ssh-credential: jenkins-ssh
gerrit-server-name: OpenDaylight
mvn-site-id: opendaylight-site
mvn-snapshot-id: opendaylight-snapshot
gerrit-server-name: OpenDaylight
mvn-site-id: opendaylight-site
mvn-snapshot-id: opendaylight-snapshot
@@
-34,7
+40,7
@@
nexus-snapshot-repo: opendaylight.snapshot
git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
lftools-version: <1.0.0
nexus-snapshot-repo: opendaylight.snapshot
git-url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418'
lftools-version: <1.0.0
- packer-version: 1.
1.3
+ packer-version: 1.
2.4
# defaults for parameters installing openstack for csit jobs
devstack-hash: ''
# defaults for parameters installing openstack for csit jobs
devstack-hash: ''
@@
-58,7
+64,11
@@
tenant-network-type: 'vxlan'
odl-sfc-driver: 'odl'
odl-snat-mode: 'controller'
tenant-network-type: 'vxlan'
odl-sfc-driver: 'odl'
odl-snat-mode: 'controller'
+ enable-itm-direct-tunnels: 'false'
openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
+ os-cmb-cnt: 1
+ os-ctl-cnt: 0
+ os-cmp-cnt: 0
# openstack-infra-parameters defaults
archive-artifacts: ''
# openstack-infra-parameters defaults
archive-artifacts: ''
@@
-74,7
+84,7
@@
sm-features: ''
# CSIT images configuration
sm-features: ''
# CSIT images configuration
- openstack_system_image_
ocata: ZZCI - CentOS 7 - devstack-ocata
- 20171208-1649
+ openstack_system_image_
queens: ZZCI - CentOS 7 - devstack-pike
- 20171208-1649
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
@@
-187,9
+197,9
@@
# Manual CSIT job lists used by sanity or periodic in nature.
csit-high-frequency-list-fluorine: >
# Manual CSIT job lists used by sanity or periodic in nature.
csit-high-frequency-list-fluorine: >
- netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
+ netvirt-csit-1node-
0cmb-1ctl-2cmp-
openstack-queens-upstream-stateful-fluorine
csit-high-frequency-list-oxygen: >
csit-high-frequency-list-oxygen: >
- netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen
+ netvirt-csit-1node-
0cmb-1ctl-2cmp-
openstack-queens-upstream-stateful-oxygen
csit-sanity-list-fluorine: >
openflowplugin-csit-1node-sanity-only-fluorine,
distribution-sanity-fluorine
csit-sanity-list-fluorine: >
openflowplugin-csit-1node-sanity-only-fluorine,
distribution-sanity-fluorine