From 3c570978e14d45ffbadaa93f22af0d72d6e10ea9 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 18 Nov 2015 15:39:36 +0100 Subject: 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 --- job-cfg/torbrowser-launcher.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'job-cfg') 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 @@ -169,6 +169,10 @@ defaults: torbrowser-launcher_git 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 * * *' -- cgit v1.2.3-70-g09d2