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 snmp4sdn to global-jjb Maven jobs"
[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 7809ab2c2c3dd4c3304705f34bf5e244afe8f434..ad0238ba4698e7c922ceebcbdeb868c4e6cce195 100644
(file)
--- a/
jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/
jjb/ovsdb/ovsdb-full-integration.yaml
@@
-5,20
+5,12
@@
- 'ovsdb-daily-full-integration-{stream}'
stream:
- 'ovsdb-daily-full-integration-{stream}'
stream:
- -
nitro
gen:
+ -
oxy
gen:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - nitrogen:
+ branch: 'stable/nitrogen'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jdk: openjdk8
- jdks:
- - openjdk8
- karaf-version: karaf3
- - boron:
- branch: 'stable/boron'
- jdk: openjdk8
- jdks:
- - openjdk8
karaf-version: karaf3
project: 'ovsdb'
karaf-version: karaf3
project: 'ovsdb'
@@
-45,7
+37,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
+72,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
+88,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
+155,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'