Addressed review comments

Author: harishagari

.citd/Jenkinsfilek8s

@@ -15,11 +15,14 @@ pipeline {
 		BITBUCKET_CREDENTIAL_ID = 'BITBUCKET_INTERNAL_TOKEN'
 		GITHUB_PRODUCTION_DEPLOY_URL ='https://github.com/microchip-pic-avr-examples'
 		GITHUB_TEST_DEPLOY_URL ='https://github.com/mchpTestArea'
-		//Selects the deployment URL(production or test) based on the merge target branch, selects "microchip-pic-avr-examples" if target branch is "master" , if target branch is "test_deploy" selects "mchpTestArea"
-		GITHUB_URL = ("${env.BRANCH_NAME}" == "master") ? GITHUB_PRODUCTION_DEPLOY_URL : ("${env.BRANCH_NAME}" == "test_deploy") ? GITHUB_TEST_DEPLY_URL : null
+		//Selects the deployment URL(production or test) based on the merge target branch, selects "microchip-pic-avr-examples" if target branch is "master" , if target branch is "test_deploy" selects "mchpTestArea" else null
+		GITHUB_URL = getGitHubUrl("${GITHUB_PRODUCTION_DEPLOY_URL}","${GITHUB_TEST_DEPLOY_URL}")
 		GITHUB_PRODUCTION_DEPLOY_CREDENTIAL_ID='GITHUB_MICROCHIP_PIC_AVR_EXAMPLES_TOKEN'
 		GITHUB_TEST_DEPLOY_CREDENTIAL_ID='GITHUB_PIC_AVR_TEST_TOKEN'
-	    GITHUB_CREDENTIAL_ID = ("${env.BRANCH_NAME}" == "master") ? GITHUB_PRODUCTION_DEPLOY_CREDENTIAL_ID : ("${env.BRANCH_NAME}" == "test_deploy") ? GITHUB_TEST_DEPLOY_CREDENTIAL_ID : null
+		PRODUCTION_DEPLOY_ORG = 'microchip-pic-avr-examples'
+		TEST_DEPLOY_ORG = 'mchpTestArea'
+		//Gets the Github credential id based on the deployment organization
+	    GITHUB_CREDENTIAL_ID = getGitHubCredentialId("${GITHUB_URL}","${PRODUCTION_DEPLOY_ORG}","${TEST_DEPLOY_ORG}","${GITHUB_PRODUCTION_DEPLOY_CREDENTIAL_ID}","${GITHUB_TEST_DEPLOY_CREDENTIAL_ID}")
 		//Files or folders to be excluded from deployment, if multiple files or folders use comma separator
 		DEPLOY_EXCLUDE_FOLDER_FILE_LIST = 'mchp_private'
 		//Branch(s) to be deployed, if multiple branches use comma separator. ${env.BRANCH_NAME} is the target branch of the PR.
@@ -45,8 +48,6 @@ pipeline {
         stage('Build') {
             steps {
                 script {
-				   echo "${env.GITHUB_URL}" 
-				   echo "${env.GITHUB_CREDENTIAL_ID}" 
                    execute("git clone https://bitbucket.microchip.com/scm/citd/tool-mplabx-c-build.git")
                    execute("cd ./tool-mplabx-c-build && node buildLauncher.js sp=../ rp=./output genMK=true")
                }
@@ -110,7 +111,7 @@ pipeline {
                     def asString = topics.join(", ")
                     asString = asString.replace("\n", "").replace(" ", "").replace("\t", "").replace("\r", "")
 					Boolean visibility =  true
-					if(env.GITHUB_URL.contains('microchip-pic-avr-examples'))
+					if(env.GITHUB_URL.contains(env.PRODUCTION_DEPLOY_ORG))
 					{
 					   visibility = false
 					}
@@ -242,3 +243,24 @@ String readJsonObject() {
     def jsonObj  = readJSON interpolate: true, file: "${env.SOURCE_PROJECT_META_DATA}"
     return jsonObj
 }
+
+def getGitHubUrl(String productionUrl, String testDeployUrl) {
+    String branchName = "${env.BRANCH_NAME}";
+    if(branchName == 'master') {
+        return productionUrl;
+    } else if(branchName == 'test_deploy') {
+        return testDeployUrl;
+    } else {
+        return null
+    }
+}
+
+def getGitHubCredentialId(String deployUrl, String productionDeployOrg, String testDeployOrg, String githubProductionDeployCredential, String githubTestDeployCredential) {    
+    if(deployUrl.contains(productionDeployOrg)) {
+        return githubProductionDeployCredential;
+    } else if(deployUrl.contains(testDeployOrg)) {
+        return githubTestDeployCredential;
+    } else {
+        return null
+    }
+}