summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-18 17:18:00 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-18 17:18:04 +0100
commit46a409eeac0711d080b4c088564eb875c0b9cc38 (patch)
tree1d01631704cda79e935dd323e9ef0311ea15726f
parent93a7888f7814cec6cd2e144607aa85c6a382fe30 (diff)
downloadjenkins.debian.net-46a409eeac0711d080b4c088564eb875c0b9cc38.tar.xz
torbrowser tests: keep thumbnail of last screenshot in predictable location.
-rw-r--r--TODO1
-rwxr-xr-xbin/test_torbrowser-launcher.sh2
-rw-r--r--job-cfg/torbrowser-launcher.yaml4
3 files changed, 4 insertions, 3 deletions
diff --git a/TODO b/TODO
index f82cf079..3f129641 100644
--- a/TODO
+++ b/TODO
@@ -413,6 +413,7 @@ The following ideas should really only be implemented for the new 'lvc*' tests..
=== torbrowser-launcher_*
* not sure how to test updates. maybe just run in yesterdays schroot before upgrading
+* test alpha releases
* notifications should go somewhere public, after a while of testing.
* debug why iceweasel is needed to be installed… and ca-certificates too.
* run this in qemu and enable apparmor too?
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index ee40d162..977a898f 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -21,7 +21,7 @@ cleanup_all() {
[ ! -f $VIDEO ] || mv $VIDEO $RESULTS/
cd $WORKSPACE
[ ! -f screenshot.png ] || rm screenshot.png
- [ ! -f screenshot-thumb.png ] || rm screenshot-thumb.png
+ [ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $RESULTS/
[ ! -f screenshot_from_git.png ] || mv screenshot_from_git.png screenshot.png
# shutdown and end session if it still exists
STATUS=$(schroot -l --all-sessions | grep $SESSION || true)
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 14c6ad94..a728c6dd 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -76,7 +76,7 @@
latest_only: false
- imagegallery:
title: '{my_description}'
- includes: 'results/*.png'
+ includes: 'results/screenshot_*.png'
image-width: 300
- email:
recipients: '{my_recipients}'
@@ -132,7 +132,7 @@
latest_only: false
- imagegallery:
title: '{my_description}'
- includes: 'results/*.png'
+ includes: 'results/screenshot_*.png'
image-width: 300
- email:
recipients: '{my_recipients}'