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
REM security notice about PostBuildScript plugin
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
f127e91
..
ca94823
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-71,7
+71,8
@@
- builder:
name: lf-maven-stage
builders:
- builder:
name: lf-maven-stage
builders:
- - shell: !include-raw-escape:
+ # include-raw-escape fails due to JJB bug
+ - shell: !include-raw:
- ../shell/common-variables.sh
- ../shell/maven-stage.sh
- ../shell/common-variables.sh
- ../shell/maven-stage.sh
@@
-79,7
+80,11
@@
name: lf-update-java-alternatives
builders:
- inject:
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'
@@
-161,7
+166,7
@@
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
staging-profile-id: '' # Unused in this job
stream: master
submodule-recursive: true
staging-profile-id: '' # Unused in this job
stream: master
submodule-recursive: true
@@
-276,7
+281,7
@@
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
staging-profile-id: '' # Unused by the javadoc jobs
stream: master
submodule-recursive: true
staging-profile-id: '' # Unused by the javadoc jobs
stream: master
submodule-recursive: true
@@
-391,7
+396,7
@@
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
staging-profile-id: '' # Unused by the javadoc jobs
stream: master
submodule-recursive: true
staging-profile-id: '' # Unused by the javadoc jobs
stream: master
submodule-recursive: true
@@
-505,7
+510,7
@@
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dmerge'
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dmerge'
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
nexus-cut-dirs: 6 # Number of dirs in the Nexus path to remove for wget -r.
staging-profile-id: '' # Unused by this job.
stream: master
nexus-cut-dirs: 6 # Number of dirs in the Nexus path to remove for wget -r.
staging-profile-id: '' # Unused by this job.
stream: master
@@
-638,7
+643,7
@@
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: ''
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: ''
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
stream: master
submodule-recursive: true
stream: master
submodule-recursive: true
@@
-751,7
+756,7
@@
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
mvn-global-settings: global-settings
mvn-opts: ''
mvn-params: ''
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
sonar-mvn-goal: 'sonar:sonar'
staging-profile-id: '' # Unused in this job
stream: master
sonar-mvn-goal: 'sonar:sonar'
staging-profile-id: '' # Unused in this job
stream: master
@@
-905,7
+910,7
@@
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
staging-profile-id: '' # Unused in this job
stream: master
submodule-recursive: true
staging-profile-id: '' # Unused in this job
stream: master
submodule-recursive: true
@@
-1029,7
+1034,7
@@
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
mvn-goals: clean deploy
mvn-opts: ''
mvn-params: '-Dstream=$STREAM'
- mvn-version: mvn3
3
+ mvn-version: mvn3
5
staging-profile-id: '' # Unused by this job
stream: master
submodule-recursive: true
staging-profile-id: '' # Unused by this job
stream: master
submodule-recursive: true