diff options
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 2 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index d8f5667c..ddb1534a 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -426,7 +426,7 @@ revert_git_merge() { if [ -z "$1" ] ; then echo "call $0 with a suite as param." exit 1 -elif [ "$1" = "broken_config" ] ; then +elif [ "$1" = "broken_settings" ] ; then BROKEN_SETTINGS=true shift else diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 38ca6172..6de3876f 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -228,11 +228,11 @@ - job-template: defaults: torbrowser-launcher_git - name: '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_config' + name: '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_settings' - job-template: defaults: torbrowser-launcher_git - name: '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_config' + name: '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_settings' - job-template: defaults: torbrowser-launcher_packages @@ -375,20 +375,20 @@ my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie git' my_recipients: 'holger@layer-acht.org' my_node: '' - - '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_config': + - '{name}_test_on_jessie_amd64_from_git_branch_debian_sid_with_broken_settings': my_description: 'Test torbrowser-launcher with a broken user configuration on jessie/amd64 using the branch debian/sid.' my_timed: '23 4 1 * *' 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 broken_config jessie git' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh broken_settings jessie git' my_recipients: 'holger@layer-acht.org' my_node: '' - - '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_config': + - '{name}_test_on_jessie_amd64_from_git_branch_debian_jessie_with_broken_settings': my_description: 'Test torbrowser-launcher with a broken user configuration on jessie/amd64 using the branch debian/jessie.' my_timed: '23 4 1 * *' my_gitrepo: 'git://git.debian.org/git/collab-maint/torbrowser-launcher.git' my_gitbranch: 'debian/jessie' - my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh broken_config jessie git' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh broken_settings jessie git' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_test_on_wheezy_amd64_from_backports': |