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 Ansible playbooks to new names"
[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 65a9d4e473939a632f841f54cbb79a68a50fadd6..60473bb322df49fcb79db4fc03befb1cd51b85c1 100644
(file)
--- a/
jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/
jjb/ovsdb/ovsdb-full-integration.yaml
@@
-5,21
+5,13
@@
- 'ovsdb-daily-full-integration-{stream}'
stream:
- 'ovsdb-daily-full-integration-{stream}'
stream:
- -
carbo
n:
+ -
oxyge
n:
branch: 'master'
branch: 'master'
- jdk: openjdk8
- jdks:
- - openjdk8
- - boron:
- branch: 'stable/boron'
- jdk: openjdk8
- jdks:
- - openjdk8
- - beryllium:
- branch: 'stable/beryllium'
- jdk: openjdk8
- jdks:
- - openjdk8
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ - carbon:
+ branch: 'stable/carbon'
+ karaf-version: karaf3
project: 'ovsdb'
archive-artifacts: '*.log'
project: 'ovsdb'
archive-artifacts: '*.log'
@@
-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,13
+88,13
@@
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}'
project-type: freestyle
- job-template:
name: 'ovsdb-daily-full-integration-{stream}'
project-type: freestyle
- node: centos7-docker-
2
c-4g
+ node: centos7-docker-
1
c-4g
jdk: '{jdk}'
description: >
Integration tests for the OVSDB project against different versions of
jdk: '{jdk}'
description: >
Integration tests for the OVSDB project against different versions of
@@
-114,6
+106,7
@@
parameters:
- opendaylight-infra-parameters:
parameters:
- opendaylight-infra-parameters:
+ os-cloud: '{os-cloud}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
project: '{project}'
branch: '{branch}'
refspec: 'refs/heads/{branch}'
@@
-132,7
+125,7
@@
triggers:
- timed: '@midnight'
- gerrit:
triggers:
- timed: '@midnight'
- gerrit:
- server-name: '{server-name}'
+ server-name: '{
gerrit-
server-name}'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'runit'
trigger-on:
- comment-added-contains-event:
comment-contains-value: 'runit'
@@
-162,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'
@@
-178,5
+171,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