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
Update builder image to pull in Git version fix
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index f09f4e38e82b9e5594f282fe07724bfb602b0540..9e4c418ac63f11b1121c366bae0158382694def3 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-78,7
+78,7
@@
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
200626-165329.838
'
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'
@@
-187,7
+187,7
@@
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
200626-165329.838
'
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'
@@
-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,7
+496,7
@@
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
200626-165329.838
'
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'
@@
-608,7
+608,7
@@
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
200626-165329.838
'
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'
@@
-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,7
+918,7
@@
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
200626-165329.838
'
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'
@@
-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,7
+1053,7
@@
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
200626-165329.838
'
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'
@@
-1228,6
+1228,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}'
@@
-1449,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}'
@@
-1473,7
+1481,7
@@
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
200626-165329.838
'
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'
@@
-1650,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}'
@@
-1874,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}'
@@
-2085,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:
@@
-2209,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.'