diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-11-15 15:38:33 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-11-15 15:38:33 +0100 |
| commit | b490e55a68f940a0cc50a7e89930b4bea72df989 (patch) | |
| tree | b02032824e67e58d68005970cb4440e286398a74 | |
| parent | 51798a2a3ea8c4c1c0eafae0a7a7ecde7c2ece3b (diff) | |
| download | jenkins.debian.net-b490e55a68f940a0cc50a7e89930b4bea72df989.tar.xz | |
torbrowser tests: use awesome too, clear proxy variables
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 4 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index d0322582..4a7e1d07 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -42,7 +42,9 @@ first_test() { Xvfb -ac -br -screen 0 1024x768x16 :$SCREEN & XPID=$! export DISPLAY=":$SCREEN.0" - export + unset http_proxy + unset https_proxy + timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- awesome & timeout -k 12m 11m schroot --run-session -c $SESSION --preserve-environment -- torbrowser-launcher https://www.debian.org & ffmpeg -f x11grab -i :$SCREEN.0 test-torbrowser-$SUITE.mpg > /dev/null 2>&1 & FFMPEGPID=$! diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 6392017c..3f475ca2 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -106,19 +106,19 @@ - '{name}_setup_schroot_unstable_amd64': my_description: 'Setup unstable/amd64 schroot for testing torbrowser-launcher.' my_timed: '42 1 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-unstable unstable torbrowser-launcher ca-certificates' + my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-unstable unstable torbrowser-launcher awesome ca-certificates' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_setup_schroot_stretch_amd64': my_description: 'Setup stretch/amd64 schroot for testing torbrowser-launcher.' my_timed: '42 2 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-stretch stretch torbrowser-launcher ca-certificates' + my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-stretch stretch torbrowser-launcher awesome ca-certificates' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_setup_schroot_jessie_amd64': my_description: 'Setup jessie/amd64 schroot for testing torbrowser-launcher.' my_timed: '42 3 * * *' - my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-jessie jessie torbrowser-launcher ca-certificates' + my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-jessie jessie torbrowser-launcher awesome ca-certificates' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_test_unstable_amd64': |