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
Revert "Update cloud image"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 1cb813769a9a0f178d64a8c59d7123be2c6e5cb1..422f3b160ec98570a7fa01a0efc0ab27fcdce1d0 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-82,7
+82,7
@@
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-191,7
+191,7
@@
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
#####################
@@
-500,7
+500,7
@@
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-612,7
+612,7
@@
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-922,7
+922,7
@@
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
200601-220134.752
'
+ docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20
191004-045622.840
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1057,13
+1057,13
@@
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
200601-230324.154
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
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
200601-230324.154
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1485,13
+1485,13
@@
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
200601-230324.154
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
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
200601-230324.154
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20
191004-045548.485
'
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 -
x86_64 - 20200601-220226.013
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 -
20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #