X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=6b3faa85f43556d0fbc3069413353c024a31a62a;hb=refs%2Fchanges%2F12%2F14812%2F8;hp=08bb637c482146a23b20de7855a9411692bd2fbf;hpb=1f1f893e77014a6b08d61e88614ff928b2c17587;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 08bb637c..6b3faa85 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -184,11 +184,15 @@ 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-provide-maven-settings-cleanup - builder: name: lf-maven-install @@ -271,9 +275,10 @@ - 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/common-variables.sh - ../shell/sigul-sign-dir.sh - shell: !include-raw-escape: ../shell/sigul-configuration-cleanup.sh