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 "Fix: Run docker login for gradle build jobs"
[releng/global-jjb.git]
/
jjb
/
lf-whitesource-jobs.yaml
diff --git
a/jjb/lf-whitesource-jobs.yaml
b/jjb/lf-whitesource-jobs.yaml
index
1f267ff
..
ed3a5d6
100644
(file)
--- a/
jjb/lf-whitesource-jobs.yaml
+++ b/
jjb/lf-whitesource-jobs.yaml
@@
-6,6
+6,8
@@
- builder:
name: lf-infra-wss-mvn-clean-install
builders:
- builder:
name: lf-infra-wss-mvn-clean-install
builders:
+ - inject:
+ properties-content: JAVA_OPTS={java-opts}
- conditional-step:
condition-kind: boolean-expression
condition-expression: "{mvn-clean-install}"
- conditional-step:
condition-kind: boolean-expression
condition-expression: "{mvn-clean-install}"
@@
-26,6
+28,8
@@
files:
- file-id: wss-unified-agent.config
target: $WORKSPACE/wss-unified-agent.config
files:
- file-id: wss-unified-agent.config
target: $WORKSPACE/wss-unified-agent.config
+ - file-id: global-settings
+ target: $WORKSPACE/global-settings.xml
- shell: !include-raw:
- ../shell/whitesource-unified-agent-cli.sh
- shell: !include-raw:
- ../shell/whitesource-unified-agent-cli.sh
@@
-33,7
+37,7
@@
# COMMON FUNCTIONS #
####################
# COMMON FUNCTIONS #
####################
-- lf_whitesource_common: &lf_whitesource_common
+-
_
lf_whitesource_common: &lf_whitesource_common
name: lf-whitesource-common
######################
name: lf-whitesource-common
######################
@@
-76,7
+80,7
@@
# WHITESOURCE UNIFIED AGENT SCAN #
##################################
# WHITESOURCE UNIFIED AGENT SCAN #
##################################
-- lf_wss_unified_agent_scan: &lf_wss_unified_agent_scan
+-
_
lf_wss_unified_agent_scan: &lf_wss_unified_agent_scan
name: lf-wss-unified-agent-scan
######################
name: lf-wss-unified-agent-scan
######################
@@
-86,11
+90,12
@@
branch: master
build-days-to-keep: 30
build-timeout: 60
branch: master
build-days-to-keep: 30
build-timeout: 60
- cron: "
@daily
"
+ cron: "
H H * * 7
"
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
disable-job: false
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
- java-version: openjdk8
+ java-opts: ""
+ java-version: openjdk11
mvn-clean-install: false
mvn-global-settings: global-settings
mvn-pom: ""
mvn-clean-install: false
mvn-global-settings: global-settings
mvn-pom: ""
@@
-100,7
+105,7
@@
submodule-timeout: 10
submodule-disable: false
wss-unified-agent-opts: ""
submodule-timeout: 10
submodule-disable: false
wss-unified-agent-opts: ""
- wss-unified-agent-version:
19.7
.1
+ wss-unified-agent-version:
21.2
.1
gerrit_trigger_file_paths:
- compare-type: ANT
gerrit_trigger_file_paths:
- compare-type: ANT
@@
-143,6
+148,7
@@
- lf-update-java-alternatives:
java-version: "{java-version}"
- lf-infra-wss-mvn-clean-install:
- lf-update-java-alternatives:
java-version: "{java-version}"
- lf-infra-wss-mvn-clean-install:
+ java-opts: "{java-opts}"
mvn-clean-install: "{mvn-clean-install}"
mvn-version: "{mvn-version}"
mvn-pom: "{mvn-pom}"
mvn-clean-install: "{mvn-clean-install}"
mvn-version: "{mvn-version}"
mvn-pom: "{mvn-pom}"