From 95e12ca889d9bb3c642f58902bb30eccab4ff6f1 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 11 Aug 2016 12:10:21 +1000 Subject: [PATCH] Migrate maven to freestyle for clm Change-Id: I696f9dce606fdbe4b7592a2fac0279aae5570a83 Signed-off-by: Anil Belur --- jjb/releng-templates-java.yaml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index f4bb10dad..7273ba4c4 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -8,7 +8,7 @@ # {jdk} name: '{project-name}-clm-{stream}' - project-type: maven + project-type: freestyle node: '{build-node}' jdk: '{jdk}' @@ -35,22 +35,20 @@ triggers: - timed: 'H H * * 6' - prebuilders: + builders: - provide-maven-settings: global-settings-file: 'odl-global-settings' settings-file: '{mvn-settings}' - - maven: - maven-name: '{mvn33}' - root-pom: 'pom.xml' - goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' - maven-opts: '-Xmx4096m -XX:MaxPermSize=512m' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - - postbuilders: + - maven-target: + maven-version: '{mvn33}' + pom: 'pom.xml' + goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' + java-opts: + - '-Xmx4096m -XX:MaxPermSize=512m' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'odl-global-settings' + global-settings-type: cfp - shell: 'find . -regex ".*karaf/target" | xargs rm -rf' - check-clm: application-name: '{project-name}' -- 2.36.6