diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-20 10:40:37 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-20 10:40:37 +0100 |
| commit | c96a044d4684a9194854473a154e8433aac8f1f1 (patch) | |
| tree | 700928e4caeecc3e241e4779f51d4b002c629594 | |
| parent | 378a29aa0a9e8ffeb9879a97d488f67449305f0f (diff) | |
| download | jenkins.debian.net-c96a044d4684a9194854473a154e8433aac8f1f1.tar.xz | |
torbrowser tests: test upstream master with debian/sid now that debian/exp branch is gone
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 8597cf82..10e22620 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -278,11 +278,11 @@ my_recipients: 'holger@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@layer-acht.org' my_node: '' - '{name}_test_on_stretch_amd64': |