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 "Update Ubuntu 14.04 gbp images"
[releng/builder.git]
/
jjb
/
ovsdb
/
ovsdb-full-integration.yaml
diff --git
a/jjb/ovsdb/ovsdb-full-integration.yaml
b/jjb/ovsdb/ovsdb-full-integration.yaml
index 037c9d58e2cb0683f459faeaff6a4fa8863e327e..fc46b0df833698edf5496a3f64871c4151cd9372 100644
(file)
--- a/
jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/
jjb/ovsdb/ovsdb-full-integration.yaml
@@
-45,7
+45,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'ovsdb-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'ovsdb-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- builder:
global-settings-type: cfp
- builder:
@@
-80,7
+80,7
@@
builders:
- inject:
properties-content: OVS_VERSION={OVS_VERSION}
builders:
- inject:
properties-content: OVS_VERSION={OVS_VERSION}
- - shell: !include-raw-escape:
include-raw-
setup-docker.sh
+ - shell: !include-raw-escape: setup-docker.sh
- inject:
properties-file: env.properties
- run-southbound-it:
- inject:
properties-file: env.properties
- run-southbound-it:
@@
-96,7
+96,7
@@
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
OVS_VERSION: '{OVS_VERSION}'
maven-version: '{maven-version}'
stream: '{stream}'
- - shell: !include-raw-escape:
include-raw-
cleanup-docker.sh
+ - shell: !include-raw-escape: cleanup-docker.sh
- job-template:
name: 'ovsdb-daily-full-integration-{stream}'
- job-template:
name: 'ovsdb-daily-full-integration-{stream}'
@@
-163,7
+163,7
@@
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'ovsdb-settings'
settings-type: cfp
- '-Xmx1024m -XX:MaxPermSize=256m'
settings: 'ovsdb-settings'
settings-type: cfp
- global-settings: '
odl-
global-settings'
+ global-settings: 'global-settings'
global-settings-type: cfp
- run-ovsdb-it:
maven-version: 'mvn33'
global-settings-type: cfp
- run-ovsdb-it:
maven-version: 'mvn33'
@@
-179,5
+179,4
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[ovsdb]'
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[ovsdb]'
- - opendaylight-infra-shiplogs:
- maven-version: 'mvn33'
+ - lf-infra-publish