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 422f3b160ec98570a7fa01a0efc0ab27fcdce1d0..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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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'
@@
-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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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'
@@
-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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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'
@@
-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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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'
@@
-1481,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 - 202006
01-154124.204
'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 202006
26-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'