From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 17 Sep 2019 21:05:36 +0000 (-0700)
Subject: Clear ALT_NEXUS_URL and SERVER_ID after netrc
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=8ca988962cb61ddbb058cb73d144031a57ff30da

Clear ALT_NEXUS_URL and SERVER_ID after netrc

After the netrc has been created, these need to be cleared so that
future calls to create-netrc aren't stuck using them. This has been
causing problems with pushing logs.

Change-Id: Ib351e38950ca0a382a006b473d8e2a703d0d6a66
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index af0b769..14d6403 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -164,6 +164,10 @@
           properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org'
       - lf-infra-create-netrc:
           server-id: rpm.snapshots
+      - inject:
+          properties-content: |
+            ALT_NEXUS_URL=
+            SERVER_ID=
       - shell: !include-raw:
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
@@ -171,8 +175,6 @@
           - ../shell/ta-rpm-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
-      - inject:
-          properties-content: 'ALT_NEXUS_URL='
 
 - builder:
     name: ta-lf-infra-ship-isos