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
Allow version-properties-file parameter
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
98bc714
..
f8982c0
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-29,7
+29,7
@@
condition-expression: '{maven-versions-plugin}'
steps:
- inject:
condition-expression: '{maven-versions-plugin}'
steps:
- inject:
- properties-file:
version.properties
+ properties-file:
'{version-properties-file}'
- maven-target:
maven-version: '{mvn-version}'
pom: '{mvn-pom}'
- maven-target:
maven-version: '{mvn-version}'
pom: '{mvn-pom}'
@@
-161,7
+161,7
@@
gerrit_clm_triggers:
- comment-added-contains-event:
gerrit_clm_triggers:
- comment-added-contains-event:
- comment-contains-value:
run-clm$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+run-clm\s*$'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
@@
-312,7
+312,7
@@
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-445,7
+445,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-564,7
+564,7
@@
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
- comment-contains-value:
remerge$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+remerge\s*$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-815,6
+815,7
@@
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
+ version-properties-file: version.properties
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
@@
-832,7
+833,7
@@
gerrit_release_triggers:
- comment-added-contains-event:
gerrit_release_triggers:
- comment-added-contains-event:
- comment-contains-value:
stage-release$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+stage-release\s*$'
gerrit_trigger_file_paths:
- compare-type: ANT
gerrit_trigger_file_paths:
- compare-type: ANT
@@
-883,6
+884,7
@@
settings-file: '{mvn-settings}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
settings-file: '{mvn-settings}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
+ version-properties-file: '{version-properties-file}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
@@
-992,12
+994,13
@@
- 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}'
- - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
+ version-properties-file: '{version-properties-file}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
mvn-settings: '{mvn-settings}'
+ - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- inject:
properties-content: |
CONTAINER_PULL_REGISTRY={container-public-registry}
- inject:
properties-content: |
CONTAINER_PULL_REGISTRY={container-public-registry}
@@
-1118,7
+1121,7
@@
gerrit_sonar_triggers:
- comment-added-contains-event:
gerrit_sonar_triggers:
- comment-added-contains-event:
- comment-contains-value:
run-sonar$
+ comment-contains-value:
'^Patch Set\s+\d+:\s+run-sonar\s*$'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1331,7
+1334,7
@@
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
exclude-no-code-change: false
- draft-published-event
- comment-added-contains-event:
- comment-contains-value: '^Patch Set
[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)
$'
+ comment-contains-value: '^Patch Set
\s+\d+:\s+(recheck|reverify)\s*
$'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-1425,7
+1428,7
@@
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- status-context: 'Maven Verify'
+ status-context: 'Maven Verify
{mvn-version}-{java-version}
'
permit-all: true
github-hooks: true
white-list-target-branches:
permit-all: true
github-hooks: true
white-list-target-branches:
@@
-1525,7
+1528,7
@@
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- github-pull-request:
trigger-phrase: '^(recheck|reverify)$'
only-trigger-phrase: false
- status-context: 'Maven Docker Verify'
+ status-context: 'Maven Docker Verify
{mvn-version}-{java-version}
'
permit-all: true
github-hooks: true
white-list-target-branches:
permit-all: true
github-hooks: true
white-list-target-branches: