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 "Move openflowplugin Sonar scan to Sonarcloud"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 422f3b160ec98570a7fa01a0efc0ab27fcdce1d0..e6f512f75f4ff415a5baebb65183ead866b9bf61 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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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 - 20200801-220238.229
'
#####################
# 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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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 - 20200801-220238.229
'
#####################
#####################
@@
-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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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 - 20200801-220238.229
'
#####################
# 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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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 - 20200801-220238.229
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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
200801-220136.401
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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
200801-230142.896
'
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
200801-230142.896
'
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 - 20200801-220238.229
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1481,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 - 20200
601-154124.20
4'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20200
730-200731.47
4'
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
200801-230142.896
'
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
200801-230142.896
'
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 - 20200801-220238.229
'
#####################
# Job configuration #
#####################
# Job configuration #