Updating platform jobs to checkout env var

Accenture · Jan 12, 2017 · a35a0ea · a35a0ea
1 parent 53a2fe8
commit a35a0ea
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/bootstrap/Platform_Management/Load_Cartridge_List.groovy b/bootstrap/Platform_Management/Load_Cartridge_List.groovy
@@ -6,7 +6,7 @@ def platformManagementFolder = folder(platformManagementFolderName) { displayNam
 
 // Jobs
 def loadCartridgeJob = freeStyleJob(platformManagementFolderName + "/Load_Cartridge_List")
- 
+
 // Setup setup_cartridge
 loadCartridgeJob.with{
     wrappers {
@@ -66,8 +66,8 @@ done < ${WORKSPACE}/platform-management/cartridges.txt''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch('${ADOP_PLATFORM_MANAGEMENT_VERSION:-*/master}')
             relativeTargetDir('platform-management')
         }
     }
-} 
+}
diff --git a/bootstrap/Platform_Management/Setup_Gerrit.groovy b/bootstrap/Platform_Management/Setup_Gerrit.groovy
@@ -6,7 +6,7 @@ def platformManagementFolder = folder(platformManagementFolderName) { displayNam
 
 // Jobs
 def setupGerritJob = freeStyleJob(platformManagementFolderName + "/Setup_Gerrit")
- 
+
 // Setup setup_gerrit
 setupGerritJob.with{
     wrappers {
@@ -19,7 +19,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
@@ -53,8 +53,8 @@ fi''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch('${ADOP_PLATFORM_MANAGEMENT_VERSION:-*/master}')
             relativeTargetDir('platform-management')
         }
     }
-} 
+}
diff --git a/bootstrap/Workspace_Management/Generate_Workspace.groovy b/bootstrap/Workspace_Management/Generate_Workspace.groovy
@@ -6,7 +6,7 @@ def workspaceManagementFolder = folder(workspaceManagementFolderName) { displayN
 
 // Jobs
 def generateWorkspaceJob = freeStyleJob(workspaceManagementFolderName + "/Generate_Workspace")
- 
+
 // Setup generateWorkspaceJob
 generateWorkspaceJob.with{
     parameters{
@@ -72,7 +72,7 @@ done''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch('${ADOP_PLATFORM_MANAGEMENT_VERSION:-*/master}')
         }
     }
-} 
+}
diff --git a/projects/jobs/jobs.groovy b/projects/jobs/jobs.groovy
@@ -221,7 +221,7 @@ def cartridgeFolder = folder(cartridgeFolderName) {
                 url("${platformToolsGitUrl}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch('${ADOP_PLATFORM_MANAGEMENT_VERSION:-*/master}')
         }
     }
 }

diff --git a/workspaces/jobs/jobs.groovy b/workspaces/jobs/jobs.groovy
@@ -86,7 +86,7 @@ source ${WORKSPACE}/projects/gerrit/configure.sh -r permissions-with-review''')
                 url("${platformToolsGitURL}")
                 credentials("adop-jenkins-master")
             }
-            branch("*/master")
+            branch('${ADOP_PLATFORM_MANAGEMENT_VERSION:-*/master}')
         }
     }
 }