Refactored platform management Git URL into environment variable.

Signed-off-by: Northard, Robert A <[email protected]>
Accenture · Mar 2, 2017 · 4e7c7ea · 4e7c7ea
1 parent 09cb3b1
commit 4e7c7ea
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 15 deletions.
diff --git a/bootstrap/Platform_Management/Load_Cartridge_List.groovy b/bootstrap/Platform_Management/Load_Cartridge_List.groovy
@@ -1,12 +1,20 @@
 // Constants
-def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
+
+def platformToolsGitURL = null;
+
+try{
+  platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
+}catch(MissingPropertyException exception){
+  // backwards compatible - default to gerrit.
+  platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
+}
 
 def platformManagementFolderName= "/Platform_Management"
 def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }
 
 // Jobs
 def loadCartridgeJob = freeStyleJob(platformManagementFolderName + "/Load_Cartridge_List")
- 
+
 // Setup setup_cartridge
 loadCartridgeJob.with{
     wrappers {
@@ -70,4 +78,4 @@ done < ${WORKSPACE}/platform-management/cartridges.txt''')
             relativeTargetDir('platform-management')
         }
     }
-} 
+}
diff --git a/bootstrap/Platform_Management/Setup_Gerrit.groovy b/bootstrap/Platform_Management/Setup_Gerrit.groovy
@@ -1,12 +1,20 @@
 // Constants
-def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
+
+def platformToolsGitURL = null;
+
+try{
+  platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
+}catch(MissingPropertyException exception){
+  // backwards compatible - default to gerrit.
+  platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
+}
 
 def platformManagementFolderName= "/Platform_Management"
 def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }
 
 // Jobs
 def setupGerritJob = freeStyleJob(platformManagementFolderName + "/Setup_Gerrit")
- 
+
 // Setup setup_gerrit
 setupGerritJob.with{
     wrappers {
@@ -19,7 +27,7 @@ setupGerritJob.with{
     steps {
         shell('''#!/bin/bash -ex
 
-# Fetch All-Projects 
+# Fetch All-Projects
 cd ${WORKSPACE}
 git clone ssh://jenkins@gerrit:29418/All-Projects
 cd ${WORKSPACE}/All-Projects
@@ -57,4 +65,4 @@ fi''')
             relativeTargetDir('platform-management')
         }
     }
-} 
+}
diff --git a/bootstrap/Workspace_Management/Generate_Workspace.groovy b/bootstrap/Workspace_Management/Generate_Workspace.groovy
@@ -1,12 +1,20 @@
 // Constants
-def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
+
+def platformToolsGitURL = null;
+
+try{
+  platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
+}catch(MissingPropertyException exception){
+  // backwards compatible - default to gerrit.
+  platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
+}
 
 def workspaceManagementFolderName= "/Workspace_Management"
 def workspaceManagementFolder = folder(workspaceManagementFolderName) { displayName('Workspace Management') }
 
 // Jobs
 def generateWorkspaceJob = freeStyleJob(workspaceManagementFolderName + "/Generate_Workspace")
- 
+
 // Setup generateWorkspaceJob
 generateWorkspaceJob.with{
     parameters{
@@ -75,4 +83,4 @@ done''')
             branch("*/master")
         }
     }
-} 
+}
diff --git a/projects/jobs/jobs.groovy b/projects/jobs/jobs.groovy
@@ -1,7 +1,13 @@
 // Constants
-def gerritBaseUrl = "ssh://jenkins@gerrit:29418"
-def cartridgeBaseUrl = gerritBaseUrl + "/cartridges"
-def platformToolsGitUrl = gerritBaseUrl + "/platform-management"
+
+def platformToolsGitURL = null;
+
+try{
+  platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
+}catch(MissingPropertyException exception){
+  // backwards compatible - default to gerrit.
+  platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
+}
 
 // Folders
 def workspaceFolderName = "${WORKSPACE_NAME}"
@@ -275,7 +281,7 @@ def cartridgeFolder = folder(cartridgeFolderName) {
         git {
             remote {
                 name("origin")
-                url("${platformToolsGitUrl}")
+                url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
             branch("*/master")

diff --git a/workspaces/jobs/jobs.groovy b/workspaces/jobs/jobs.groovy
@@ -1,5 +1,13 @@
 // Constants
-def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
+
+def platformToolsGitURL = null;
+
+try{
+  platformToolsGitURL = "${ADOP_PLATFORM_MANAGEMENT_GIT_URL}"
+}catch(MissingPropertyException exception){
+  // backwards compatible - default to gerrit.
+  platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management";
+}
 
 // Folders
 def workspaceFolderName = "${WORKSPACE_NAME}"