X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-custom.yaml;h=dc18e1b42de795d6eb279263e5ff49ff4fccbe96;hb=2ca3b6da8746c3ec02afedc87e90e520d1d14e36;hp=56d4fcf513824200cf828f1e3da00a7a5ee316d9;hpb=68fcac71c482e0018e4dd1e904b7c089ef87f4fc;p=releng%2Fbuilder.git diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml index 56d4fcf51..dc18e1b42 100644 --- a/jjb/ovsdb/ovsdb-custom.yaml +++ b/jjb/ovsdb/ovsdb-custom.yaml @@ -4,7 +4,7 @@ - 'ovsdb-sonar' project: 'ovsdb' - jdk: 'openjdk7' + jdk: 'openjdk8' - job-template: name: 'ovsdb-sonar' @@ -40,7 +40,8 @@ prebuilders: - shell: - !include-raw-escape include-raw-setup-docker.sh + !include-raw-escape: + - include-raw-setup-docker.sh maven: maven-name: '{mvn33}' @@ -51,19 +52,21 @@ global-settings: '{odl-global-settings}' postbuilders: + - inject: + properties-file: env.properties - maven-target: maven-version: '{mvn33}' pom: 'pom.xml' - goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar' + goals: 'verify -Pintegrationtest,coverage,jenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar -Dovsdb.controller.address=${{CONTROLLER_IP}}' properties: - 'ovsdbserver.ipaddress=127.0.0.1' - 'ovsdbserver.port=6641' + - 'ovsdb.userspace.enabled=yes' settings: '{ovsdb-settings}' global-settings: '{odl-global-settings}' - - inject: - properties-file: env.properties - shell: - !include-raw-escape include-raw-cleanup-docker.sh + !include-raw-escape: + - include-raw-cleanup-docker.sh - jacoco-nojava-workaround publishers: