[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: build the jessie branch against the 0.1.9 upstream release…

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 44aa11c3f9b4055fd09d9adb0d39ac76c05a74e9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jan 16 13:51:15 2016 +0100

    torbrowser tests: build the jessie branch against the 0.1.9 upstream release…
---
 bin/test_torbrowser-launcher.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 277cd95..c06a3b9 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -112,7 +112,12 @@ upgrade_to_package_build_from_git() {
 	# GIT_URL is set by jenkins
 	echo "$(date -u ) - building Debian package based on branch $BRANCH from $GIT_URL."
 	# build package
-	schroot --run-session -c $SESSION --directory $TMPDIR/git -- gbp buildpackage --git-ignore-branch --git-upstream-tree=origin/master -uc -us
+	if [ "$BRANCH" = "debian/jessie" ] ; then
+		local UPSTREAM_TREE=v0.1.9
+	else
+		local UPSTREAM_TREE=origin/master
+	fi
+	schroot --run-session -c $SESSION --directory $TMPDIR/git -- gbp buildpackage --git-ignore-branch --git-upstream-tree=$UPSTREAM_TREE -uc -us
 	# install it
 	local DEB=$(cd $TMPDIR ; ls torbrowser-launcher_*deb)
 	local CHANGES=$(cd $TMPDIR ; ls torbrowser-launcher_*changes)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git