From 0a47384e1d0b4165399b1ac49260d63e99c6dd76 Mon Sep 17 00:00:00 2001 From: JMorvay Date: Tue, 8 Sep 2015 14:16:09 +0200 Subject: [PATCH] Fix netconf project jenkins job maven goals Add -Pintegrationtests option to maven goals Change-Id: I8ae47add0ebb33ae5bd28456701aa62678bf212e Signed-off-by: JMorvay --- jjb/netconf/netconf.cfg | 2 +- jjb/netconf/netconf.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg index 2500c8e0c..c59c510fd 100644 --- a/jjb/netconf/netconf.cfg +++ b/jjb/netconf/netconf.cfg @@ -2,6 +2,6 @@ STREAMS: - beryllium: branch: master jdks: openjdk7,openjdk8 -MVN_GOALS: clean install -Dintegrationtests +MVN_GOALS: clean install -Pintegrationtests MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true DEPENDENCIES: aaa,controller,odlparent,yangtools diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 6beb07f56..829a641fc 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -92,7 +92,7 @@ - maven-target: maven-version: '{mvn33}' pom: 'pom.xml' - goals: 'clean install -Dintegrationtests' + goals: 'clean install -Pintegrationtests' java-opts: - '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{netconf-settings}' @@ -154,7 +154,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dintegrationtests -Dmerge' + goals: 'clean install -Pintegrationtests -Dmerge' maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{netconf-settings}' global-settings: '{odl-global-settings}' @@ -219,7 +219,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dintegrationtests' + goals: 'clean install -Pintegrationtests' maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{netconf-settings}' global-settings: '{odl-global-settings}' @@ -341,7 +341,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dintegrationtests' + goals: 'clean install -Pintegrationtests' maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{netconf-settings}' global-settings: '{odl-global-settings}' @@ -395,7 +395,7 @@ maven: maven-name: '{mvn33}' root-pom: 'pom.xml' - goals: 'clean install -Dintegrationtests -Dsonar' + goals: 'clean install -Pintegrationtests -Dsonar' maven-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' settings: '{netconf-settings}' global-settings: '{odl-global-settings}' -- 2.36.6