summaryrefslogtreecommitdiffstats
path: root/job-cfg/torbrowser-launcher.yaml
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-18 15:39:36 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-18 15:39:36 +0100
commit3c570978e14d45ffbadaa93f22af0d72d6e10ea9 (patch)
treee5424871f2e50e57fe0a90869ddf62cf0466f031 /job-cfg/torbrowser-launcher.yaml
parent692a85f26dae7cd2ccd76cde5d8d2c00ff04eac1 (diff)
downloadjenkins.debian.net-3c570978e14d45ffbadaa93f22af0d72d6e10ea9.tar.xz
torbrowser tests: add new job to test tbb-l which is build using the upstream master branch, in which the debian/experimental branch is merged into
Diffstat (limited to 'job-cfg/torbrowser-launcher.yaml')
-rw-r--r--job-cfg/torbrowser-launcher.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 696260b1..14c6ad94 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -170,6 +170,10 @@
name: '{name}_test_on_unstable_amd64_from_git_branch_debian_sid'
- job-template:
+ defaults: torbrowser-launcher_git
+ name: '{name}_test_on_unstable_amd64_from_git_branch_upstream_master'
+
+- job-template:
defaults: torbrowser-launcher_packages
name: '{name}_test_on_stretch_amd64'
@@ -247,6 +251,13 @@
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git'
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_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_recipients: 'holger@layer-acht.org'
+ my_node: ''
- '{name}_test_on_stretch_amd64':
my_description: 'Test torbrowser-launcher from and on stretch/amd64.'
my_timed: '23 3 * * *'