From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 20 Dec 2018 12:26:55 +0000 (-0500)
Subject: Ensure that no lingering .netrc is overriding cfg
X-Git-Tag: v0.29.0~8
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F14020%2F1;p=releng%2Fglobal-jjb.git

Ensure that no lingering .netrc is overriding cfg

If a .netrc already exists with permissions to the same server
as logs, credentials in .netrc are read in order so the log
credentials will not be used. Ensure that no such file pre-exists
before we try to ship logs.

Change-Id: I0449702fd27837208e25a26e34a62f0b8a551c67
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 206e717e..08bb637c 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'