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 "Migrate l2switch matrix-verify jobs to freestyle-verify jobs"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 0a7eea0187341bb5684a113cf3fc0d463c245a33..ce39d849c2a906cb7ab8750f9c434664b7b9ccd3 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-72,7
+72,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-mininet:
+ - integration-
jclouds
-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
@@
-158,7
+158,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-mininet:
+ - integration-
jclouds
-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
controller-image: '{controller-image}'
controller-vms: 1
mininet-image: '{mininet-image}'
@@
-194,6
+194,7
@@
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@
-206,6
+207,7
@@
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@
-302,6
+304,7
@@
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '180'
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '180'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@
-314,6
+317,7
@@
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '180'
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '180'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@
-374,7
+378,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-mininet:
+ - integration-
jclouds
-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 3
mininet-image: '{mininet-image}'
controller-image: '{controller-image}'
controller-vms: 3
mininet-image: '{mininet-image}'
@@
-461,7
+465,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-mininet:
+ - integration-
jclouds
-controller-mininet:
controller-image: '{controller-image}'
controller-vms: 3
mininet-image: '{mininet-image}'
controller-image: '{controller-image}'
controller-vms: 3
mininet-image: '{mininet-image}'
@@
-498,6
+502,7
@@
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@
-510,6
+515,7
@@
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@
-607,6
+613,7
@@
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
yaxis: '{01-plot-yaxis}'
group: '{01-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@
-619,6
+626,7
@@
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
yaxis: '{02-plot-yaxis}'
group: '{02-plot-group}'
num-builds: '5400'
+ keep-records: true
style: line
use-description: false
csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
style: line
use-description: false
csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@
-680,6
+688,10
@@
name: ODL_ENABLE_L3_FWD
default: '{odl-enable-l3}'
description: 'Enable L3 FWD in ODL for createing br-ex'
name: ODL_ENABLE_L3_FWD
default: '{odl-enable-l3}'
description: 'Enable L3 FWD in ODL for createing br-ex'
+ - string:
+ name: PUBLIC_BRIDGE
+ default: '{public-bridge}'
+ description: 'Specifies public bridge for provider and external networking'
- string:
name: ENABLE_OS_SERVICES
default: '{enable-openstack-services}'
- string:
name: ENABLE_OS_SERVICES
default: '{enable-openstack-services}'
@@
-701,7
+713,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-devstack:
+ - integration-
jclouds
-controller-devstack:
controller-image: '{controller-image}'
controller-vms: 1
openstack-image: '{openstack-image}'
controller-image: '{controller-image}'
controller-vms: 1
openstack-image: '{openstack-image}'
@@
-727,7
+739,7
@@
- integration-cleanup-tmp
publishers:
- integration-cleanup-tmp
publishers:
- - integration-robot:
+ - integration-robot
-tempest
:
unstable-if: 0.0
pass-if: 100.0
- email-notification:
unstable-if: 0.0
pass-if: 100.0
- email-notification:
@@
-810,7
+822,7
@@
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
wrappers:
- opendaylight-infra-wrappers:
build-timeout: '{build-timeout}'
- - integration-
openstack
-controller-devstack:
+ - integration-
jclouds
-controller-devstack:
controller-image: '{controller-image}'
controller-vms: 3
openstack-image: '{openstack-image}'
controller-image: '{controller-image}'
controller-vms: 3
openstack-image: '{openstack-image}'
@@
-837,7
+849,7
@@
- integration-cleanup-tmp
publishers:
- integration-cleanup-tmp
publishers:
- - integration-robot:
+ - integration-robot
-tempest
:
unstable-if: 0.0
pass-if: 100.0
- email-notification:
unstable-if: 0.0
pass-if: 100.0
- email-notification: