From 67785ac859fb5e376be83a6e63e1d4b22007f410 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 2 Apr 2019 17:14:15 +0100 Subject: [PATCH] Use the jenkins pipeline checkout mechanism for getting release and source repo --- release/do.groovy | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/release/do.groovy b/release/do.groovy index fd2b06b..ada51bb 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -10,6 +10,7 @@ tempfolder = "${WORKSPACE}/temp" gitrevparseoutputfile = "${tempfolder}/gitrevparse.out" metascript = autobuilder.getmetafolderscript() +gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy") def resetfolders() { dir(summaryfolder) { @@ -57,7 +58,7 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { // Get the latest head revision of the release repo without checking out working copy; Check out to a folder unique to component; Extract any meta def previousreleasemeta = buildmeta.getNewMetaObject(this) dir(releaserepofolder) { - sh("git clone ${releaserepo} ${checkoutfolder}") + gh.gitCheckout(releaserepo, '*/master', checkoutfolder, "", 1, false) } previousreleasemeta = getpreviousreleasemeta(buildmeta, checkoutfolder) dir(checkoutfolder) { @@ -69,27 +70,7 @@ def checkoutreleaserepo(buildmeta, String checkoutfolder) { def checkoutsourcerepo(buildmeta, String checkoutfolder) { def String sourcerepo = buildmeta.gitinfo.remoteurl - if (sourcerepo) { - // Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component - if (fileExists(checkoutfolder)) { - dir(checkoutfolder) { - sh(""" - git reset --hard - git clean -fdx - git pull - # Remove all tags that are not already on the remote - git tag -l | xargs git tag -d >/dev/null - git fetch -t >/dev/null - """ - ) - } - } - else { - dir(sourcerepofolder) { - sh("git clone ${sourcerepo} ${checkoutfolder}") - } - } - } + gh.gitCheckout(sourcerepo, '*/master', checkoutfolder, "", 1, false) } def getcomponentartifacts(toplevelbuildmeta, buildinfo, String repofolder, String tempfolder) {