From 90021302e4638315233574ae8376e53466fd7987 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Tue, 23 May 2017 11:07:51 +0200
Subject: [PATCH] Issue #2861216: Get hostmaster release from Git.

This should make it possible for CI to test the packages before a full release on D.o is done.
---
 aegir-release.make | 5 +++--
 scripts/release.sh | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/aegir-release.make b/aegir-release.make
index b6999da5..f8c3726e 100644
--- a/aegir-release.make
+++ b/aegir-release.make
@@ -5,6 +5,7 @@ api = 2
 projects[drupal][type] = "core"
 
 ; The release.sh script updates the version of hostmaster.
-projects[hostmaster][version] = "7.x-3.0-dev"
+projects[hostmaster][tag] = "7.x-3.0-dev"
 projects[hostmaster][type] = "profile"
-projects[hostmaster][variant] = "projects"
+projects[hostmaster][download][type] = "git"
+projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
diff --git a/scripts/release.sh b/scripts/release.sh
index 306e3cfb..46b6404d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -79,7 +79,7 @@ dch -v $debversion -D unstable
 git add debian/changelog
 
 echo changing hostmaster version in aegir-release.make
-sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
+sed -i'.tmp' -e "/7.x-3.0-dev/$major-$version/" aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
 
 echo enabling release makefilexs
 ln -sf aegir-release.make aegir.make && git add aegir.make
@@ -160,8 +160,13 @@ echo =========
 echo
 # Can we push?
 if prompt_yes_no "Push tags and commits upstream? "; then
+
     # this makes sure we push the commit *and* the tag, and leave the revert commit for the moment.
-    git push --tags origin tag $NEW_TAG:$CURRENT_BRANCH
+    git push --tags origin $commitid:$CURRENT_BRANCH
+
+    # Also push provision to GitLab to kick off CI.
+    git push --tags gitlab $commitid:$CURRENT_BRANCH
+
     git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git push --tags origin HEAD
     git --work-tree=build-area/hosting --git-dir=build-area/hosting/.git push --tags origin HEAD
     git --work-tree=build-area/eldir --git-dir=build-area/eldir/.git push --tags origin HEAD
-- 
GitLab