[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: preserve artifacts too
Holger Levsen
holger at moszumanska.debian.org
Sun Nov 15 16:30:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit f7b10ed74d17531d6a8eb926e9f74d04ac6b0714
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Nov 15 17:29:53 2015 +0100
torbrowser tests: preserve artifacts too
---
bin/test_torbrowser-launcher.sh | 7 ++++---
job-cfg/torbrowser-launcher.yaml | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index b329f57..622d5b3 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -17,6 +17,7 @@ cleanup_all() {
[ ! -f screenshot.png ] || mv screenshot.png $RESULTS/
[ ! -f screenshot-thumb.png ] || mv screenshot-thumb.png $RESULTS/
[ ! -f test-torbrowser-$SUITE.mpg ] || mv test-torbrowser-$SUITE.mpg $RESULTS/
+ [ ! -f screenshot_from_git.png ] || mv screenshot_from_git.png screenshot.png
# shutdown and end session if it still exists
schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus stop || true
schroot --end-session -c tbb-launcher-$SUITE-$(basename $TMPDIR) > /dev/null 2>&1 || true
@@ -53,7 +54,7 @@ first_test() {
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 &
+ ffmpeg -f x11grab -i :$SCREEN.0 -s 1024x768 test-torbrowser-${SUITE}_$(date +%Y%m%d%H%M).mpg > /dev/null 2>&1 &
FFMPEGPID=$!
for i in $(seq 1 16) ; do
sleep 15
@@ -77,13 +78,13 @@ first_test() {
TMPDIR=$(mktemp -d) # where everything actually happens
trap cleanup_all INT TERM EXIT
WORKSPACE=$(pwd)
-mkdir -p results
RESULTS=$WORKSPACE/results
+[ ! -f screenshot.png ] || mv screenshot.png screenshot_from_git.png
+mkdir -p $RESULTS
cd $TMPDIR
SUITE=$1
echo "$(date -u) - testing torbrowser-launcher on $SUITE now."
-[ ! -f screenshot.png ] || rm screenshot.png
first_test # test package from the archive
# then build package and test it (probably via triggering another job)
# not sure how to test updates. maybe just run old install?
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 8968042..f735c27 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -65,6 +65,9 @@
parse-rules: '/srv/jenkins/logparse/torbrowser-launcher.rules'
unstable-on-warning: 'true'
fail-on-error: 'true'
+ - archive:
+ artifacts: 'results/*.*'
+ latest_only: false
- imagegallery:
title: '{my_description}'
includes: 'results/*.png'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list