From e82c9c9ebdc0d97059a7a788c2aeb6813602b723 Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Wed, 29 Sep 2021 19:24:12 -0600 Subject: [PATCH] Fix: configure python packaging repositories For production Jenkins we will use https://upload.pypi.org/legacy/ and for sandbox we will use https://test.pypi.org/legacy/ Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-3969 Signed-off-by: Kevin Sandi Change-Id: I17bee54015a810d15812686c54f51988b37970ba --- .../managed-config-files/custom/pypirc/content | 16 +++++++++++----- .../custom/pypirc/customizedCredentialMappings.yaml | 8 ++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content index 6ddb0d00..97629c5c 100644 --- a/jenkins-config/managed-config-files/custom/pypirc/content +++ b/jenkins-config/managed-config-files/custom/pypirc/content @@ -3,9 +3,15 @@ [distutils] # this tells distutils what package indexes you can push to index-servers = - $PYPIRC_URL_USR + pypi + pypi-test -[$PYPIRC_URL_USR] -repository: $PYPIRC_URL_PSW -username: $PYPIRC_USR -password: $PYPIRC_PSW \ No newline at end of file +[pypi] +repository: https://upload.pypi.org/legacy/ +username: $PYPI_RELEASE_USR +password: $PYPI_RELEASE_PSW + +[pypi-test] +repository: https://test.pypi.org/legacy/ +username: $PYPI_TEST_USR +password: $PYPI_TEST_PSW \ No newline at end of file diff --git a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml index ad020863..a0f796d1 100644 --- a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml @@ -1,6 +1,6 @@ --- customizedCredentialMappings: - - credentialsId: "pypirc" - tokenKey: "PYPIRC" - - credentialsId: "pypirc-url" - tokenKey: "PYPIRC_URL" \ No newline at end of file + - credentialsId: "pypi-release" + tokenKey: "PYPI_RELEASE" + - credentialsId: "pypi-test" + tokenKey: "PYPI_TEST" \ No newline at end of file -- 2.16.6