From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 17 Sep 2019 21:37:21 +0000 (+0000)
Subject: Merge "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=dce421e2f61e675a915d6fc7869650ffe137a04d;hp=-c

Merge "Clear ALT_NEXUS_URL and SERVER_ID after netrc"
---

dce421e2f61e675a915d6fc7869650ffe137a04d
diff --combined jjb/akraino-templates/akraino-ta-common-macros.yaml
index 2edf8de,14d6403..f750e29
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@@ -37,7 -37,7 +37,7 @@@
       - ta-parameters-rpmbuilder
  
  - parameter:
 -    name: ta-parameters-ci-ta-rpmbuilder
 +    name: ta-parameters-ci-ta/rpmbuilder
      parameters:
       - ta-parameters-manifest
       - ta-parameters-build-tools
@@@ -164,6 -164,10 +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 +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
@@@ -213,7 -215,7 +215,7 @@@
                project-to-build: '$GERRIT_PROJECT'
  
  - builder:
 -    name: ta-builder-job-verify-ta-rpmbuilder
 +    name: ta-builder-job-verify-ta/rpmbuilder
      builders:
          - ta-builder-scm:
                git-url: '{git-url}'