use different secrets for pypi prod and test (#566)

beniwohli · web-flow · commit e02641f833fc · 2019-08-28T13:18:03.000+02:00
This allows us to use token authentication, as tokens differ for test and prod
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -188,7 +188,8 @@ def generateStep(version){
 }
 
 def releasePackages(){
-  withSecretVault(secret: 'secret/apm-team/ci/apm-agent-python-twine',
+  def vault_secret = (env.REPO_URL == 'https://upload.pypi.org/legacy/') ? 'secret/apm-team/ci/apm-agent-python-pypi-prod' : 'secret/apm-team/ci/apm-agent-python-pypi-test'
+  withSecretVault(secret: vault_secret,
                   user_var_name: 'TWINE_USER', pass_var_name: 'TWINE_PASSWORD'){
     sh(label: "Release packages", script: """
     set +x
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -302,7 +302,8 @@ def runScript(Map params = [:]){
 }
 
 def releasePackages(){
-  withSecretVault(secret: 'secret/apm-team/ci/apm-agent-python-twine',
+  def vault_secret = (env.REPO_URL == 'https://upload.pypi.org/legacy/') ? 'secret/apm-team/ci/apm-agent-python-pypi-prod' : 'secret/apm-team/ci/apm-agent-python-pypi-test'
+  withSecretVault(secret: vault_secret,
                   user_var_name: 'TWINE_USER', pass_var_name: 'TWINE_PASSWORD'){
     sh(label: "Release packages", script: """
     set +x

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,8 @@ def generateStep(version){`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`def releasePackages(){`
`191`		`- withSecretVault(secret: 'secret/apm-team/ci/apm-agent-python-twine',`
	`191`	`+ def vault_secret = (env.REPO_URL == 'https://upload.pypi.org/legacy/') ? 'secret/apm-team/ci/apm-agent-python-pypi-prod' : 'secret/apm-team/ci/apm-agent-python-pypi-test'`
	`192`	`+ withSecretVault(secret: vault_secret,`
`192`	`193`	`user_var_name: 'TWINE_USER', pass_var_name: 'TWINE_PASSWORD'){`
`193`	`194`	`sh(label: "Release packages", script: """`
`194`	`195`	`set +x`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,8 @@ def runScript(Map params = [:]){`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`def releasePackages(){`
`305`		`- withSecretVault(secret: 'secret/apm-team/ci/apm-agent-python-twine',`
	`305`	`+ def vault_secret = (env.REPO_URL == 'https://upload.pypi.org/legacy/') ? 'secret/apm-team/ci/apm-agent-python-pypi-prod' : 'secret/apm-team/ci/apm-agent-python-pypi-test'`
	`306`	`+ withSecretVault(secret: vault_secret,`
`306`	`307`	`user_var_name: 'TWINE_USER', pass_var_name: 'TWINE_PASSWORD'){`
`307`	`308`	`sh(label: "Release packages", script: """`
`308`	`309`	`set +x`