From 1380a3b0142d5bfedc24f12dcd1bb18fd7ae2220 Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Thu, 19 Aug 2021 13:27:22 -0500 Subject: [PATCH] Fix JJBINI This patch is to standardize with other projects and fix the credentials mappings. We've also updated the credentials on the sandbox and production to reflect this change. Signed-off-by: Vanessa Rene Valderrama Change-Id: I2ccf4203f727e97e144ed67a965a0a63efddc2e7 --- jenkins-config/managed-config-files/custom/jjbini/content | 12 ++++++------ .../custom/jjbini/customizedCredentialMappings.yaml | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jenkins-config/managed-config-files/custom/jjbini/content b/jenkins-config/managed-config-files/custom/jjbini/content index af7879d4e..c5484e4ff 100644 --- a/jenkins-config/managed-config-files/custom/jjbini/content +++ b/jenkins-config/managed-config-files/custom/jjbini/content @@ -5,20 +5,20 @@ include_path=.:scripts:~/git/ recursive=True [jenkins] -user=$JENKINS_JOBBUILDER_USR -password=$JENKINS_JOBBUILDER_PSW +user=$JOBBUILDER_PROD_USR +password=$JOBBUILDER_PROD_PSW url=https://jenkins.fd.io query_plugins_info=True [production] -user=$JENKINS_JOBBUILDER_USR -password=$JENKINS_JOBBUILDER_PSW +user=$JOBBUILDER_PROD_USR +password=$JOBBUILDER_PROD_PSW url=https://jenkins.fd.io query_plugins_info=True [sandbox] -user=$JENKINS_JOBBUILDER_USR -password=$JENKINS_JOBBUILDER_PSW +user=$JOBBUILDER_SANDBOX_USR +password=$JOBBUILDER_SANDBOX_PSW url=https://jenkins.fd.io/sandbox query_plugins_info=True diff --git a/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml index 0beddb870..cb9cdaf20 100644 --- a/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/custom/jjbini/customizedCredentialMappings.yaml @@ -1,4 +1,6 @@ --- customizedCredentialMappings: - - credentialsId: "jenkins-jobbuilder" - tokenKey: "JENKINS_JOBBUILDER" + - credentialsId: "jobbuilder-prod" + tokenKey: "JOBBUILDER_PROD" + - credentialsId: "jobbuilder-sandbox" + tokenKey: "JOBBUILDER_SANDBOX" -- 2.16.6