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
Print git-diff when pre-commit fails
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index e077c34aecd47d8b07865a08b4b4b5af2345a970..1cb813769a9a0f178d64a8c59d7123be2c6e5cb1 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-78,11
+78,11
@@
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-187,11
+187,11
@@
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
#####################
@@
-208,7
+208,7
@@
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
- controller-scope: '{
scope
}'
+ controller-scope: '{
install
}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
@@
-447,7
+447,7
@@
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
- controller-scope: '{
scope
}'
+ controller-scope: '{
install
}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
@@
-496,11
+496,11
@@
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-608,11
+608,11
@@
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
openstack-heat-template-dir: openstack-hot
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
controller-max-mem: '2048m'
tools_system_count: '1'
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-628,7
+628,7
@@
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
- controller-scope: '{
scope
}'
+ controller-scope: '{
install
}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
@@
-868,7
+868,7
@@
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
- controller-scope: '{
scope
}'
+ controller-scope: '{
install
}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
@@
-918,11
+918,11
@@
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
docker_system_count: '1'
docker_system_flavor: 'odl-standard-1'
controller-max-mem: '2048m'
docker_system_count: '1'
docker_system_flavor: 'odl-standard-1'
- docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20
191004-045622.840
'
+ docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20
200601-220134.752
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-938,7
+938,7
@@
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
repo-url: '{repo-url}'
robot-options: '{robot-options}'
# Controller
- controller-scope: '{
scope
}'
+ controller-scope: '{
install
}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
@@
-1053,17
+1053,17
@@
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
200601-230324.154
'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
- openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
200601-230324.154
'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1139,8
+1139,9
@@
- string:
name: ODL_ML2_PORT_BINDING
default: '{odl-ml2-port-binding}'
- string:
name: ODL_ML2_PORT_BINDING
default: '{odl-ml2-port-binding}'
- description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
- network-topology)'
+ description: >
+ Method of networking-odl port-binding (pseudo-agentdb-binding or
+ legacy-port-binding or network-topology)
- string:
name: DEVSTACK_KUBERNETES_PLUGIN_REPO
default: '{devstack-kubernetes-plugin-repo}'
- string:
name: DEVSTACK_KUBERNETES_PLUGIN_REPO
default: '{devstack-kubernetes-plugin-repo}'
@@
-1216,8
+1217,9
@@
- string:
name: LBAAS_SERVICE_PROVIDER
default: '{lbaas-service-provider}'
- string:
name: LBAAS_SERVICE_PROVIDER
default: '{lbaas-service-provider}'
- description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
- neutron-lbaas'
+ description: >
+ The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in
+ local.conf - only relevant when using neutron-lbaas
- string:
name: ODL_SFC_DRIVER
default: '{odl-sfc-driver}'
- string:
name: ODL_SFC_DRIVER
default: '{odl-sfc-driver}'
@@
-1226,11
+1228,16
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
- description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
- repo url to pull from.'
+ description: >
+ Install a custom OVS. It can be an OVS version to build
+ (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-1446,6
+1453,10
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
@@
-1470,17
+1481,17
@@
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
odl_system_count: 1
odl_system_flavor: 'odl-highcpu-4'
- odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
191201-060129.829
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20
200601-154124.204
'
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
200601-230324.154
'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
openstack_system2_count: 0
openstack_system2_flavor: 'odl-standard-1'
- openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
200601-230324.154
'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
tools_system_count: 1
tools_system_flavor: 'odl-highcpu-2'
- tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
x86_64 - 20200601-220226.013
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1647,6
+1658,10
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
@@
-1871,6
+1886,10
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
- string:
name: OVS_INSTALL
default: '{ovs-install}'
@@
-2082,6
+2101,10
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-2206,3
+2229,7
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
+ - string:
+ name: GROUP_ADD_MOD_ENABLED
+ default: '{group-add-mod-enabled}'
+ description: 'The Group add mod enabled mode to be configured - options are true/false.'