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 "Auto Update CSIT Jobs to run for magnesium"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 1fda3ae235c09f303a06bae10b2d91f994eac817..5a3c431f82b8000170ad3eddb18f0f74ade0692f 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-78,10
+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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
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-2
5 - 20190416-121328.240
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-2
8 - 20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-98,11
+99,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: only
robot-options: '{robot-options}'
# Controller
controller-scope: only
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
1
+ vm_0_count:
'1'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-184,10
+187,12
@@
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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
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-25 - 20190416-121328.240'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+
#####################
# Job configuration #
#####################
# Job configuration #
@@
-204,11
+209,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
1
+ vm_0_count:
'1'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-441,11
+448,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
1
+ vm_0_count:
'1'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-487,10
+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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
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-2
5 - 20190416-121328.240
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-2
8 - 20190415-091034.881
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-507,11
+517,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: only
robot-options: '{robot-options}'
# Controller
controller-scope: only
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
3
+ vm_0_count:
'3'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-596,10
+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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
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-2
5 - 20190416-121328.240
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-2
8 - 20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-616,11
+629,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
3
+ vm_0_count:
'3'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-854,11
+869,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
3
+ vm_0_count:
'3'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{tools_system_count}'
@@
-901,10
+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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
docker_system_count: 1
docker_system_flavor: 'odl-standard-1'
docker_system_count: 1
docker_system_flavor: 'odl-standard-1'
- docker_system_image: 'ZZCI - CentOS 7 - docker -
20180723-235456.035
'
+ docker_system_image: 'ZZCI - CentOS 7 - docker -
x86_64 - 20191004-045622.840
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-921,11
+939,13
@@
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
robot-options: '{robot-options}'
# Controller
controller-scope: '{scope}'
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
debug-map: '{debug-map}'
install-features: 'odl-jolokia,{install-features}'
use-features-boot: 'True'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-2-type:
- integration-stack-2-type:
- vm_0_count:
3
+ vm_0_count:
'3'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{docker_system_count}'
vm_0_flavor: '{odl_system_flavor}'
vm_0_image: '{odl_system_image}'
vm_1_count: '{docker_system_count}'
@@
-1033,16
+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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack -
20180911-204116.460
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack -
x86_64 - 20191004-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 -
20180911-204116.460
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack -
x86_64 - 20191004-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-2
5 - 20190416-121328.240
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-2
8 - 20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1059,9
+1080,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
@@
-1277,9
+1300,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
@@
-1445,16
+1470,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 - 20190924-232354.381'
+ odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
+ controller-max-mem: '2048m'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
openstack_system_count: 1
openstack_system_flavor: 'odl-standard-4'
- openstack_system_image: 'ZZCI - CentOS 7 - devstack -
20180911-204116.460
'
+ openstack_system_image: 'ZZCI - CentOS 7 - devstack -
x86_64 - 20191004-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 -
20180911-204116.460
'
+ openstack_system2_image: 'ZZCI - CentOS 7 - devstack -
x86_64 - 20191004-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-2
5 - 20190416-121328.240
'
+ tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-2
8 - 20190415-091034.881
'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1471,9
+1497,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
@@
-1693,9
+1721,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
- integration-stack-4-type:
vm_0_count: '{odl_system_count}'
vm_0_flavor: '{odl_system_flavor}'
@@
-1910,6
+1940,8
@@
builders:
- integration-rebase-gerrit-patch
- wipe-org-opendaylight-repo
builders:
- integration-rebase-gerrit-patch
- wipe-org-opendaylight-repo
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- maven-target:
maven-version: mvn35
pom: '{project}/pom.xml'
- maven-target:
maven-version: mvn35
pom: '{project}/pom.xml'
@@
-1976,6
+2008,7
@@
openstack-cloud: vex
openstack-heat-template: csit-apex-3-instance-type.yaml
openstack-heat-template-dir: openstack-hot
openstack-cloud: vex
openstack-heat-template: csit-apex-3-instance-type.yaml
openstack-heat-template-dir: openstack-hot
+ controller-max-mem: '2048m'
#####################
# Job configuration #
#####################
# Job configuration #
@@
-1992,9
+2025,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-3-type:
vm_0_count: '{apex_controller_count}'
vm_0_flavor: '{apex_controller_flavor}'
- integration-stack-3-type:
vm_0_count: '{apex_controller_count}'
vm_0_flavor: '{apex_controller_flavor}'
@@
-2114,9
+2149,11
@@
robot-options: '{robot-options}'
# Controller
controller-scope: ''
robot-options: '{robot-options}'
# Controller
controller-scope: ''
+ controller-max-mem: '{controller-max-mem}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
debug-map: '{debug-map}'
install-features: '{install-features}'
use-features-boot: '{use-features-boot}'
+ elasticsearch-attribute: '{elasticsearch-attribute}'
- integration-stack-3-type:
vm_0_count: '{apex_controller_count}'
vm_0_flavor: '{apex_controller_flavor}'
- integration-stack-3-type:
vm_0_count: '{apex_controller_count}'
vm_0_flavor: '{apex_controller_flavor}'