summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-19 16:41:30 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-19 16:41:30 +0100
commitfda3bf1dbd62587bc250c3e361b347a2c234cbef (patch)
treee5cb6daa40dee503b570418dad112dd5770566d8
parent7b20640e2246b85f00131311bab8be38f2df6e46 (diff)
downloadjenkins.debian.net-fda3bf1dbd62587bc250c3e361b347a2c234cbef.tar.xz
torbrowser tests: test upstream master branch daily against sid, no matter if there were commits
-rw-r--r--TODO1
-rw-r--r--job-cfg/torbrowser-launcher.yaml6
2 files changed, 6 insertions, 1 deletions
diff --git a/TODO b/TODO
index 19ea5e5c..6a77d909 100644
--- a/TODO
+++ b/TODO
@@ -413,7 +413,6 @@ The following ideas should really only be implemented for the new 'lvc*' tests..
=== torbrowser-launcher_*
* fix "schroot session cleanup loop" in _common.sh to ignore other schroots
-* build daily from upstream master against sid no matter if there where commits
* test tbl in German
* test tbl on i386
* test alpha releases
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 9ba8339e..12109368 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -38,6 +38,7 @@
project-type: freestyle
triggers:
- pollscm: '*/6 * * * *'
+ - timed: '{my_timed}'
properties:
- sidebar:
url: https://jenkins.debian.net/userContent/about.html
@@ -250,6 +251,7 @@
my_node: ''
- '{name}_test_on_unstable_amd64_from_git_branch_debian_sid':
my_description: 'Test torbrowser-launcher on unstable/amd64 using the branch debian/sid.'
+ my_timed: ''
my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git'
my_gitbranch: 'debian/sid'
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git'
@@ -257,6 +259,7 @@
my_node: ''
- '{name}_test_on_unstable_amd64_from_git_branch_debian_experimental':
my_description: 'Test torbrowser-launcher on unstable/amd64 using the branch debian/experimental.'
+ my_timed: ''
my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git'
my_gitbranch: 'debian/experimental'
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git'
@@ -264,6 +267,7 @@
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_timed: '42 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'
@@ -301,6 +305,7 @@
my_node: ''
- '{name}_test_on_jessie_amd64_from_git_branch_debian_sid':
my_description: 'Test torbrowser-launcher on jessie/amd64 using the branch debian/sid.'
+ my_timed: ''
my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git'
my_gitbranch: 'debian/sid'
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie git'
@@ -308,6 +313,7 @@
my_node: ''
- '{name}_test_on_jessie_amd64_from_git_branch_debian_experimental':
my_description: 'Test torbrowser-launcher on jessie/amd64 using the branch debian/experimental.'
+ my_timed: ''
my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git'
my_gitbranch: 'debian/experimental'
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie git'