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
Merge "Add sphinx link to rtd jobs page"
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
609c592
..
cc711a6
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-59,6
+59,15
@@
- ../shell/common-variables.sh
- ../shell/maven-deploy.sh
- ../shell/common-variables.sh
- ../shell/maven-deploy.sh
+- builder:
+ name: lf-update-java-alternatives
+ builders:
+ - inject:
+ properties-content: 'SET_JDK_VERSION={java-version}'
+ - shell: !include-raw-escape: ../shell/update-java-alternatives.sh
+ - inject:
+ properties-file: '/tmp/java.env'
+
####################
# COMMON FUNCTIONS #
####################
####################
# COMMON FUNCTIONS #
####################
@@
-83,7
+92,6
@@
project-type: freestyle
node: '{build-node}'
project-type: freestyle
node: '{build-node}'
- jdk: '{java-version}'
properties:
- lf-infra-properties:
properties:
- lf-infra-properties:
@@
-171,6
+179,8
@@
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-267,6
+277,8
@@
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-386,6
+398,8
@@
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-499,6
+513,8
@@
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-620,6
+636,8
@@
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-772,6
+790,7
@@
builders:
- lf-infra-maven-sonar:
builders:
- lf-infra-maven-sonar:
+ java-version: '{java-version}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
@@
-786,6
+805,8
@@
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
builders:
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- inject:
# Switch this to the sonar wrapper when JJB 2.0 is available
properties-content: SONAR_HOST_URL=$SONAR_URL
- inject:
# Switch this to the sonar wrapper when JJB 2.0 is available
properties-content: SONAR_HOST_URL=$SONAR_URL
@@
-892,6
+913,8
@@
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@
-1008,6
+1031,8
@@
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
- lf-jacoco-nojava-workaround
- lf-maven-install:
mvn-version: '{mvn-version}'
+ - lf-update-java-alternatives:
+ java-version: '{java-version}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'