[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: test upstream master with debian/sid now that debian/exp branch is gone

[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 c96a044d4684a9194854473a154e8433aac8f1f1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Nov 20 10:40:37 2015 +0100

    torbrowser tests: test upstream master with debian/sid now that debian/exp branch is gone
---
 job-cfg/torbrowser-launcher.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 8597cf8..10e2262 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -278,11 +278,11 @@
             my_recipients: 'holger at layer-acht.org'
             my_node: ''
         - '{name}_test_on_unstable_amd64_from_git_branch_upstream_master':
-            my_description: 'Test torbrowser-launcher on unstable/amd64 using the upstream master branch, in which the debian/experimental branch is merged into.'
+            my_description: 'Test torbrowser-launcher on unstable/amd64 using the upstream master branch, in which the debian/sid branch is merged into.'
             my_timed: '23 2 * * *'
             my_gitrepo: 'git://github.com/micahflee/torbrowser-launcher'
             my_gitbranch: 'master'
-            my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git merge debian/experimental'
+            my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git merge debian/sid'
             my_recipients: 'holger at layer-acht.org'
             my_node: ''
         - '{name}_test_on_stretch_amd64':

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