[Qa-jenkins-scm] [jenkins.debian.net] 02/02: torbrowser-tests: actually build against upstream master branch

[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 64cd57fd518d1cb4e5c8337bfaea58a0866a39c6
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Mar 28 10:41:26 2016 -0400

    torbrowser-tests: actually build against upstream master branch
---
 bin/test_torbrowser-launcher.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 7e134d4..9197311 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -114,6 +114,8 @@ upgrade_to_package_build_from_git() {
 	# build package
 	if [ "$BRANCH" = "debian/jessie" ] || [ "$BRANCH" = "debian/jessie-proposed" ] ; then
 		local UPSTREAM_TREE=v0.1.9
+	elif [ "$BRANCH" = "upstream-master-plus-debian-packaging" ] ; then
+		local UPSTREAM_TREE=micahlee/master
 	else
 		local UPSTREAM_TREE=origin/master
 	fi

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