commit 68e17b0d74042c1263ae3107d4c9d12b6715cc8d
author Oleg Iurchenko <oiurchenko@mirantis.com> Tue Jan 02 12:24:49 2018 +0200
committer Oleg Iurchenko <oiurchenko@mirantis.com> Tue Jan 02 13:21:18 2018 +0200
tree 2d959388547892461917f908e37bf567ce7e10df
parent fcd55d6f346c16c449477a76d42f33ba3b1fa3aa

Add an abbility to define remote for buildSourceGbp and buildSource.

This patch adds ad ability to define remote for buildSourceGbp and
buildSource in order to build a package by specified remote or local
branch.

Change-Id: I6a38df038587f7982129f9b460ce0e4dc262f70b
Related-PROD: PROD-16581

src/com/mirantis/mk/Debian.groovy

diff --git a/src/com/mirantis/mk/Debian.groovy b/src/com/mirantis/mk/Debian.groovy
index 9746ada..0919b9d 100644
--- a/src/com/mirantis/mk/Debian.groovy
+++ b/src/com/mirantis/mk/Debian.groovy
@@ -61,7 +61,7 @@
  * @param image Image name to use for build (default debian:sid)
  * @param snapshot Generate snapshot version (default false)
  */
-def buildSource(dir, image="debian:sid", snapshot=false, gitEmail='jenkins@dummy.org', gitName='Jenkins', revisionPostfix="") {
+def buildSource(dir, image="debian:sid", snapshot=false, gitEmail='jenkins@dummy.org', gitName='Jenkins', revisionPostfix="", remote="origin/") {
     def isGit
     try {
         sh("test -d ${dir}/.git")
@@ -71,7 +71,7 @@
     }
 
     if (isGit == true) {
-        buildSourceGbp(dir, image, snapshot, gitEmail, gitName, revisionPostfix)
+        buildSourceGbp(dir, image, snapshot, gitEmail, gitName, revisionPostfix, remote)
     } else {
         buildSourceUscan(dir, image)
     }
@@ -106,7 +106,7 @@
  * @param image Image name to use for build (default debian:sid)
  * @param snapshot Generate snapshot version (default false)
  */
-def buildSourceGbp(dir, image="debian:sid", snapshot=false, gitName='Jenkins', gitEmail='jenkins@dummy.org', revisionPostfix="") {
+def buildSourceGbp(dir, image="debian:sid", snapshot=false, gitName='Jenkins', gitEmail='jenkins@dummy.org', revisionPostfix="", remote="origin/") {
     def common = new com.mirantis.mk.Common()
     def jenkinsUID = common.getJenkinsUid()
     def jenkinsGID = common.getJenkinsGid()
@@ -142,12 +142,12 @@
                 TIMESTAMP=`date +%Y%m%d%H%M` &&
                 if [[ "`cat debian/source/format`" = *quilt* ]]; then
                     UPSTREAM_BRANCH=`(grep upstream-branch debian/gbp.conf || echo master) | cut -d = -f 2 | tr -d " "` &&
-                    UPSTREAM_REV=`git rev-parse --short origin/\$UPSTREAM_BRANCH` &&
+                    UPSTREAM_REV=`git rev-parse --short ${remote}\$UPSTREAM_BRANCH` &&
                     NEW_UPSTREAM_VERSION="\$UPSTREAM_VERSION+\$TIMESTAMP.\$UPSTREAM_REV" &&
                     NEW_UPSTREAM_VERSION_TAG=`echo \$NEW_UPSTREAM_VERSION | sed 's/.*://'` &&
                     NEW_VERSION=\$NEW_UPSTREAM_VERSION-\$REVISION$revisionPostfix &&
                     echo "Generating new upstream version \$NEW_UPSTREAM_VERSION_TAG" &&
-                    sudo -H -E -u jenkins git tag \$NEW_UPSTREAM_VERSION_TAG origin/\$UPSTREAM_BRANCH &&
+                    sudo -H -E -u jenkins git tag \$NEW_UPSTREAM_VERSION_TAG ${remote}\$UPSTREAM_BRANCH &&
                     sudo -H -E -u jenkins git merge -X theirs \$NEW_UPSTREAM_VERSION_TAG
                 else
                     NEW_VERSION=\$VERSION+\$TIMESTAMP.`git rev-parse --short HEAD`$revisionPostfix