Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make rtd jobs verbose
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
cc711a6
..
b2482c1
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-52,6
+52,15
@@
# Macros #
##########
# Macros #
##########
+- builder:
+ name: lf-maven-build
+ builders:
+ - inject:
+ properties-content: 'MAVEN_GOALS={mvn-goals}'
+ - shell: !include-raw-escape:
+ - ../shell/common-variables.sh
+ - ../shell/maven-build.sh
+
- builder:
name: lf-maven-deploy
builders:
- builder:
name: lf-maven-deploy
builders:
@@
-59,11
+68,23
@@
- ../shell/common-variables.sh
- ../shell/maven-deploy.sh
- ../shell/common-variables.sh
- ../shell/maven-deploy.sh
+- builder:
+ name: lf-maven-stage
+ builders:
+ # include-raw-escape fails due to JJB bug
+ - shell: !include-raw:
+ - ../shell/common-variables.sh
+ - ../shell/maven-stage.sh
+
- builder:
name: lf-update-java-alternatives
builders:
- inject:
- builder:
name: lf-update-java-alternatives
builders:
- inject:
- properties-content: 'SET_JDK_VERSION={java-version}'
+ # Work around inject plugin overriding our GIT_URL variable incorrectly
+ # https://issues.jenkins-ci.org/browse/JENKINS-49775
+ properties-content: |
+ SET_JDK_VERSION={java-version}
+ GIT_URL="$GIT_URL"
- shell: !include-raw-escape: ../shell/update-java-alternatives.sh
- inject:
properties-file: '/tmp/java.env'
- shell: !include-raw-escape: ../shell/update-java-alternatives.sh
- inject:
properties-file: '/tmp/java.env'
@@
-486,6
+507,7
@@
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
+ mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dmerge'
mvn-version: mvn33
mvn-opts: ''
mvn-params: '-Dmerge'
mvn-version: mvn33
@@
-526,9
+548,9
@@
NEXUS_REPO={nexus-snapshot-repo}
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
NEXUS_REPO={nexus-snapshot-repo}
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
- - ../shell/common-variables.sh
- ../shell/maven-fetch-metadata.sh
- ../shell/maven-fetch-metadata.sh
- - ../shell/maven-build.sh
+ - lf-maven-build:
+ mvn-goals: '{mvn-goals}'
- lf-maven-deploy
- lf-provide-maven-settings-cleanup
- lf-maven-deploy
- lf-provide-maven-settings-cleanup
@@
-618,6
+640,7
@@
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
+ mvn-goals: clean deploy
mvn-opts: ''
mvn-params: ''
mvn-version: mvn33
mvn-opts: ''
mvn-params: ''
mvn-version: mvn33
@@
-645,10
+668,10
@@
server-id: '{mvn-staging-id}'
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
server-id: '{mvn-staging-id}'
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
- - ../shell/common-variables.sh
- ../shell/maven-patch-release.sh
- ../shell/maven-patch-release.sh
- - ../shell/maven-build.sh
- - ../shell/maven-stage.sh
+ - lf-maven-build:
+ mvn-goals: '{mvn-goals}'
+ - lf-maven-stage
- lf-provide-maven-settings-cleanup
- job-template:
- lf-provide-maven-settings-cleanup
- job-template:
@@
-884,6
+907,7
@@
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
+ mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-version: mvn33
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-version: mvn33
@@
-920,8
+944,8
@@
settings-file: '{mvn-settings}'
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
settings-file: '{mvn-settings}'
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
- - ../shell/common-variables.sh
- - ../shell/maven-build.sh
+ - lf-maven-build:
+ mvn-goals: '{mvn-goals}'
- lf-provide-maven-settings-cleanup
publishers:
- lf-provide-maven-settings-cleanup
publishers:
@@
-1007,6
+1031,7
@@
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
git-url: '$GIT_URL/$PROJECT'
java-version: openjdk8
mvn-global-settings: global-settings
+ mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-version: mvn33
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-version: mvn33
@@
-1040,9
+1065,8
@@
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-build-deps.sh
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-build-deps.sh
- - shell: !include-raw-escape:
- - ../shell/common-variables.sh
- - ../shell/maven-build.sh
+ - lf-maven-build:
+ mvn-goals: '{mvn-goals}'
- lf-provide-maven-settings-cleanup
publishers:
- lf-provide-maven-settings-cleanup
publishers: