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
Update lf-maven-stage macro with missing parts
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
9671ebb
..
f20dbe9
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-24,10
+24,16
@@
- builder:
name: lf-maven-stage
builders:
- builder:
name: lf-maven-stage
builders:
+ - lf-provide-maven-settings:
+ global-settings-file: '{mvn-global-settings}'
+ settings-file: '{mvn-settings}'
+ - lf-infra-create-netrc:
+ server-id: '{mvn-staging-id}'
# include-raw-escape fails due to JJB bug
# include-raw-escape fails due to JJB bug
- - shell: !include-raw:
+ - shell: !include-raw
-escape
:
- ../shell/common-variables.sh
- ../shell/maven-stage.sh
- ../shell/common-variables.sh
- ../shell/maven-stage.sh
+ - lf-provide-maven-settings-cleanup
- builder:
name: lf-update-java-alternatives
- builder:
name: lf-update-java-alternatives
@@
-310,7
+316,7
@@
- lf-provide-maven-settings-cleanup
- job-template:
- lf-provide-maven-settings-cleanup
- job-template:
- name: '{project-name}-maven-javadoc-publish-{stream}'
+ name: '{project-name}-maven-javadoc-publish-{stream}
-{java-version}
'
id: gerrit-maven-javadoc-publish
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
id: gerrit-maven-javadoc-publish
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
@@
-340,7
+346,7
@@
branch-pattern: '**/{branch}'
- job-template:
branch-pattern: '**/{branch}'
- job-template:
- name: '{project-name}-maven-javadoc-publish-{stream}'
+ name: '{project-name}-maven-javadoc-publish-{stream}
-{java-version}
'
id: github-maven-javadoc-publish
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
id: github-maven-javadoc-publish
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
@@
-436,7
+442,7
@@
- lf-provide-maven-settings-cleanup
- job-template:
- lf-provide-maven-settings-cleanup
- job-template:
- name: '{project-name}-maven-javadoc-verify-{stream}'
+ name: '{project-name}-maven-javadoc-verify-{stream}
-{java-version}
'
id: gerrit-maven-javadoc-verify
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
id: gerrit-maven-javadoc-verify
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
@@
-464,7
+470,7
@@
branch-pattern: '**/{branch}'
- job-template:
branch-pattern: '**/{branch}'
- job-template:
- name: '{project-name}-maven-javadoc-verify-{stream}'
+ name: '{project-name}-maven-javadoc-verify-{stream}
-{java-version}
'
id: github-maven-javadoc-verify
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
id: github-maven-javadoc-verify
<<: *lf_maven_common
# yamllint disable-line rule:key-duplicates
@@
-716,17
+722,20
@@
- 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}'
- - lf-infra-create-netrc:
- server-id: '{mvn-staging-id}'
- shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-build:
mvn-goals: '{mvn-goals}'
- lf-sigul-sign-dir:
sign-artifacts: '{sign-artifacts}'
sign-dir: '$WORKSPACE/m2repo'
- shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-build:
mvn-goals: '{mvn-goals}'
- lf-sigul-sign-dir:
sign-artifacts: '{sign-artifacts}'
sign-dir: '$WORKSPACE/m2repo'
- - lf-maven-stage
+ - lf-maven-stage:
+ mvn-global-settings: '{mvn-global-settings}'
+ mvn-settings: '{mvn-settings}'
+ mvn-staging-id: '{mvn-staging-id}'
- lf-maven-central:
mvn-central: '{mvn-central}'
- lf-maven-central:
mvn-central: '{mvn-central}'
+ mvn-global-settings: '{mvn-global-settings}'
+ mvn-settings: '{mvn-settings}'
ossrh-profile-id: '{ossrh-profile-id}'
- lf-provide-maven-settings-cleanup
ossrh-profile-id: '{ossrh-profile-id}'
- lf-provide-maven-settings-cleanup
@@
-941,8
+950,7
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- # Build weekly on Saturdays
- - timed: 'H H * * 6'
+ - timed: '{obj:cron}'
- github-pull-request:
trigger-phrase: '^run-sonar$'
only-trigger-phrase: true
- github-pull-request:
trigger-phrase: '^run-sonar$'
only-trigger-phrase: true