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 <ksandi@contractor.linuxfoundation.org>
Change-Id: I17bee54015a810d15812686c54f51988b37970ba

diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content
index 6ddb0d0..97629c5 100644 (file)
--- 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 ad02086..a0f796d 100644 (file)
--- 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