X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=2b6cf10fb0b69bd08494c871a5b2b28d1ee9a727;hb=refs%2Fchanges%2F93%2F14393%2F9;hp=206e717e9ea3068f18f9f3ee01068c21057e75f2;hpb=a7822fcdc18c0730d931851b4297a78413f59e2c;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 206e717e..2b6cf10f 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -56,6 +56,8 @@
 - 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'
@@ -182,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