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 sigul macro to support sign mode
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
206e717
..
6b3faa8
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-56,6
+56,8
@@
- builder:
name: lf-infra-ship-logs
builders:
- builder:
name: lf-infra-ship-logs
builders:
+ # Ensure no pre-existing .netrc files are overriding logs config
+ - lf-provide-maven-settings-cleanup
- config-file-provider:
files:
- file-id: 'jenkins-log-archives-settings'
- config-file-provider:
files:
- file-id: 'jenkins-log-archives-settings'
@@
-182,11
+184,15
@@
condition-kind: boolean-expression
condition-expression: '{mvn-central}'
steps:
condition-kind: boolean-expression
condition-expression: '{mvn-central}'
steps:
+ - lf-provide-maven-settings:
+ global-settings-file: '{mvn-global-settings}'
+ settings-file: '{mvn-settings}'
- lf-infra-create-netrc:
server-id: 'ossrh'
- inject:
properties-content: 'OSSRH_PROFILE_ID={ossrh-profile-id}'
- shell: !include-raw-escape: ../shell/maven-central.sh
- lf-infra-create-netrc:
server-id: 'ossrh'
- inject:
properties-content: 'OSSRH_PROFILE_ID={ossrh-profile-id}'
- shell: !include-raw-escape: ../shell/maven-central.sh
+ - lf-provide-maven-settings-cleanup
- builder:
name: lf-maven-install
- builder:
name: lf-maven-install
@@
-269,9
+275,10
@@
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- inject:
- shell: !include-raw-escape: ../shell/sigul-configuration.sh
- shell: !include-raw-escape: ../shell/sigul-install.sh
- inject:
- properties-content: SIGN_DIR={sign-dir}
+ properties-content: |
+ SIGN_DIR={sign-dir}
+ SIGN_MODE={sign-mode}
- shell: !include-raw-escape:
- shell: !include-raw-escape:
- - ../shell/common-variables.sh
- ../shell/sigul-sign-dir.sh
- shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh
- ../shell/sigul-sign-dir.sh
- shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh