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 <vvalderrama@linuxfoundation.org>
Change-Id: I2ccf4203f727e97e144ed67a965a0a63efddc2e7

diff --git a/jenkins-config/managed-config-files/custom/jjbini/content b/jenkins-config/managed-config-files/custom/jjbini/content
index af7879d..c5484e4 100644 (file)
--- 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 0beddb8..cb9cdaf 100644 (file)
--- 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"