diff options
| author |   Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-05-19 18:04:10 -0400 |
|---|---|---|
| committer | Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-05-19 18:04:13 -0400 |
| commit | dffe5f70993a06bf64eab89ca485648a93f16b59 (patch) | |
| tree | 82e886a24c0ca056956c754a9bb164b3451cff62 /jjb/honeycomb | |
| parent | 6f562af8162d0778de89facd1c0cf29149bd78a6 (diff) | |
Simplify cfp jjb configuration
JJB 1.5.0 now allows CFP to use freeform IDs so lets use it to simplify
the yaml configuration.
Change-Id: Id64e772cb9fc1ed2f0deb11b6ba405f4ab43fe1e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Diffstat (limited to 'jjb/honeycomb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index ecb12b2b3..965c6fedf 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -54,8 +54,10 @@ root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: '{honeycomb-settings}' - global-settings: '{global-settings}' + settings: 'honeycomb-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp postbuilders: - shell: | @@ -123,8 +125,10 @@ root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: '{honeycomb-settings}' - global-settings: '{global-settings}' + settings: 'honeycomb-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp postbuilders: - shell: | @@ -178,8 +182,10 @@ root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: '{honeycomb-settings}' - global-settings: '{global-settings}' + settings: 'honeycomb-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp postbuilders: - shell: | @@ -240,8 +246,10 @@ root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: '{honeycomb-settings}' - global-settings: '{global-settings}' + settings: 'honeycomb-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp postbuilders: - shell: | |