Merge pull request #11 from nickdgriffin/master

Fixing platform jobs to a set version of adop-platform-management
Accenture · May 10, 2018 · 53db750 · 53db750
2 parents d2bd6c4 + 6f0e1aa
commit 53db750
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 5 deletions.
diff --git a/bootstrap/Platform_Management/Load_Cartridge_List.groovy b/bootstrap/Platform_Management/Load_Cartridge_List.groovy
@@ -4,6 +4,14 @@ def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
 def platformManagementFolderName= "/Platform_Management"
 def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }
 
+def adopPlatformManagementVersion = (binding.variables.containsKey("ADOP_PLATFORM_MANAGEMENT_VERSION")) ? "${ADOP_PLATFORM_MANAGEMENT_VERSION}".toString() : '';
+def adopPlatformManagementVersionRef = '${ADOP_PLATFORM_MANAGEMENT_VERSION}';
+
+if (!adopPlatformManagementVersion.matches("[a-fA-F0-9]{8,40}")) {
+  out.println("[WARN] ADOP_PLATFORM_MANAGEMENT_VERSION is set to '" + adopPlatformManagementVersion + "' which is not a valid hash - defaulting to '*/master'")
+  adopPlatformManagementVersionRef = '*/master';
+}
+
 // Jobs
 def loadCartridgeJob = freeStyleJob(platformManagementFolderName + "/Load_Cartridge_List")
 
@@ -66,7 +74,7 @@ done < ${WORKSPACE}/platform-management/cartridges.txt''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch(adopPlatformManagementVersionRef)
             relativeTargetDir('platform-management')
         }
     }

diff --git a/bootstrap/Platform_Management/Setup_Gerrit.groovy b/bootstrap/Platform_Management/Setup_Gerrit.groovy
@@ -4,6 +4,14 @@ def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
 def platformManagementFolderName= "/Platform_Management"
 def platformManagementFolder = folder(platformManagementFolderName) { displayName('Platform Management') }
 
+def adopPlatformManagementVersion = (binding.variables.containsKey("ADOP_PLATFORM_MANAGEMENT_VERSION")) ? "${ADOP_PLATFORM_MANAGEMENT_VERSION}".toString() : '';
+def adopPlatformManagementVersionRef = '${ADOP_PLATFORM_MANAGEMENT_VERSION}';
+
+if (!adopPlatformManagementVersion.matches("[a-fA-F0-9]{8,40}")) {
+  out.println("[WARN] ADOP_PLATFORM_MANAGEMENT_VERSION is set to '" + adopPlatformManagementVersion + "' which is not a valid hash - defaulting to '*/master'")
+  adopPlatformManagementVersionRef = '*/master';
+}
+
 // Jobs
 def setupGerritJob = freeStyleJob(platformManagementFolderName + "/Setup_Gerrit")
 
@@ -53,7 +61,7 @@ fi''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch(adopPlatformManagementVersionRef)
             relativeTargetDir('platform-management')
         }
     }

diff --git a/bootstrap/Workspace_Management/Generate_Workspace.groovy b/bootstrap/Workspace_Management/Generate_Workspace.groovy
@@ -4,6 +4,14 @@ def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
 def workspaceManagementFolderName= "/Workspace_Management"
 def workspaceManagementFolder = folder(workspaceManagementFolderName) { displayName('Workspace Management') }
 
+def adopPlatformManagementVersion = (binding.variables.containsKey("ADOP_PLATFORM_MANAGEMENT_VERSION")) ? "${ADOP_PLATFORM_MANAGEMENT_VERSION}".toString() : '';
+def adopPlatformManagementVersionRef = '${ADOP_PLATFORM_MANAGEMENT_VERSION}';
+
+if (!adopPlatformManagementVersion.matches("[a-fA-F0-9]{8,40}")) {
+  out.println("[WARN] ADOP_PLATFORM_MANAGEMENT_VERSION is set to '" + adopPlatformManagementVersion + "' which is not a valid hash - defaulting to '*/master'")
+  adopPlatformManagementVersionRef = '*/master';
+}
+
 // Jobs
 def generateWorkspaceJob = freeStyleJob(workspaceManagementFolderName + "/Generate_Workspace")
 
@@ -72,7 +80,7 @@ done''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch(adopPlatformManagementVersionRef)
         }
     }
 } 
diff --git a/projects/jobs/jobs.groovy b/projects/jobs/jobs.groovy
@@ -3,6 +3,14 @@ def gerritBaseUrl = "ssh://jenkins@gerrit:29418"
 def cartridgeBaseUrl = gerritBaseUrl + "/cartridges"
 def platformToolsGitUrl = gerritBaseUrl + "/platform-management"
 
+def adopPlatformManagementVersion = (binding.variables.containsKey("ADOP_PLATFORM_MANAGEMENT_VERSION")) ? "${ADOP_PLATFORM_MANAGEMENT_VERSION}".toString() : '';
+def adopPlatformManagementVersionRef = '${ADOP_PLATFORM_MANAGEMENT_VERSION}';
+
+if (!adopPlatformManagementVersion.matches("[a-fA-F0-9]{8,40}")) {
+  out.println("[WARN] ADOP_PLATFORM_MANAGEMENT_VERSION is set to '" + adopPlatformManagementVersion + "' which is not a valid hash - defaulting to '*/master'")
+  adopPlatformManagementVersionRef = '*/master';
+}
+
 // Folders
 def workspaceFolderName = "${WORKSPACE_NAME}"
 
@@ -418,7 +426,7 @@ def cartridgeFolder = folder(cartridgeFolderName) {
                 url("${platformToolsGitUrl}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch(adopPlatformManagementVersionRef)
         }
     }
 }

diff --git a/workspaces/jobs/jobs.groovy b/workspaces/jobs/jobs.groovy
@@ -1,6 +1,14 @@
 // Constants
 def platformToolsGitURL = "ssh://jenkins@gerrit:29418/platform-management"
 
+def adopPlatformManagementVersion = (binding.variables.containsKey("ADOP_PLATFORM_MANAGEMENT_VERSION")) ? "${ADOP_PLATFORM_MANAGEMENT_VERSION}".toString() : '';
+def adopPlatformManagementVersionRef = '${ADOP_PLATFORM_MANAGEMENT_VERSION}';
+
+if (!adopPlatformManagementVersion.matches("[a-fA-F0-9]{8,40}")) {
+  out.println("[WARN] ADOP_PLATFORM_MANAGEMENT_VERSION is set to '" + adopPlatformManagementVersion + "' which is not a valid hash - defaulting to '*/master'")
+  adopPlatformManagementVersionRef = '*/master';
+}
+
 // Folders
 def workspaceFolderName = "${WORKSPACE_NAME}"
 def workspaceFolder = folder(workspaceFolderName)
@@ -87,7 +95,7 @@ source ${WORKSPACE}/projects/gerrit/configure.sh -r permissions-with-review''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch(adopPlatformManagementVersionRef)
         }
     }
 }