summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorThanh Ha <thanh.ha@linuxfoundation.org>2016-05-19 18:04:10 -0400
committerThanh Ha <thanh.ha@linuxfoundation.org>2016-05-19 18:04:13 -0400
commitdffe5f70993a06bf64eab89ca485648a93f16b59 (patch)
tree82e886a24c0ca056956c754a9bb164b3451cff62 /jjb/vpp
parent6f562af8162d0778de89facd1c0cf29149bd78a6 (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/vpp')
-rw-r--r--jjb/vpp/vpp.yaml10
1 files changed, 6 insertions, 4 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index aba5a8a6a..fafd91667 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -190,11 +190,13 @@
- maven-target:
maven-version: '{mvn33}'
goals: '--version'
- settings: '{vpp-settings}'
- global-settings: '{global-settings}'
+ settings: 'vpp-settings'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- provide-maven-settings:
- settings-file: '{vpp-settings}'
- global-settings-file: '{global-settings}'
+ settings-file: 'vpp-settings'
+ global-settings-file: 'global-settings'
- shell:
!include-raw-escape: include-raw-vpp-maven-push.sh