Actually working

Accenture · Mar 24, 2017 · f76004e · f76004e
1 parent 8b324b6
commit f76004e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/bootstrap/Platform_Management/Load_Cartridge_List.groovy b/bootstrap/Platform_Management/Load_Cartridge_List.groovy
@@ -5,10 +5,11 @@ 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'")
-  adopPlatformManagementVersion = '*/master';
+  adopPlatformManagementVersionRef = '*/master';
 }
 
 // Jobs
@@ -73,7 +74,7 @@ done < ${WORKSPACE}/platform-management/cartridges.txt''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch(adopPlatformManagementVersion)
+            branch(adopPlatformManagementVersionRef)
             relativeTargetDir('platform-management')
         }
     }

diff --git a/bootstrap/Platform_Management/Setup_Gerrit.groovy b/bootstrap/Platform_Management/Setup_Gerrit.groovy
@@ -5,10 +5,11 @@ 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'")
-  adopPlatformManagementVersion = '*/master';
+  adopPlatformManagementVersionRef = '*/master';
 }
 
 // Jobs
@@ -60,7 +61,7 @@ fi''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch(adopPlatformManagementVersion)
+            branch(adopPlatformManagementVersionRef)
             relativeTargetDir('platform-management')
         }
     }

diff --git a/bootstrap/Workspace_Management/Generate_Workspace.groovy b/bootstrap/Workspace_Management/Generate_Workspace.groovy
@@ -5,10 +5,11 @@ 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'")
-  adopPlatformManagementVersion = '*/master';
+  adopPlatformManagementVersionRef = '*/master';
 }
 
 // Jobs
@@ -79,7 +80,7 @@ done''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch(adopPlatformManagementVersion)
+            branch(adopPlatformManagementVersionRef)
         }
     }
 } 
diff --git a/projects/jobs/jobs.groovy b/projects/jobs/jobs.groovy
@@ -4,10 +4,11 @@ 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'")
-  adopPlatformManagementVersion = '*/master';
+  adopPlatformManagementVersionRef = '*/master';
 }
 
 // Folders
@@ -425,7 +426,7 @@ def cartridgeFolder = folder(cartridgeFolderName) {
                 url("${platformToolsGitUrl}")
                 credentials("adop-jenkins-master")
             }
-            branch(adopPlatformManagementVersion)
+            branch(adopPlatformManagementVersionRef)
         }
     }
 }

diff --git a/workspaces/jobs/jobs.groovy b/workspaces/jobs/jobs.groovy
@@ -2,10 +2,11 @@
 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'")
-  adopPlatformManagementVersion = '*/master';
+  adopPlatformManagementVersionRef = '*/master';
 }
 
 // Folders
@@ -94,7 +95,7 @@ source ${WORKSPACE}/projects/gerrit/configure.sh -r permissions-with-review''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch(adopPlatformManagementVersion)
+            branch(adopPlatformManagementVersionRef)
         }
     }
 }