[Qa-jenkins-scm] [jenkins.debian.net] 01/01: torbrowser tests: fix installation from git

[Holger Levsen]

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 cf28d815568a95d49c050e46957a49c67b29eb6e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Nov 16 03:34:26 2015 +0100

    torbrowser tests: fix installation from git
---
 bin/test_torbrowser-launcher.sh  | 13 ++++++++-----
 job-cfg/torbrowser-launcher.yaml |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index f7113a0..1b11c28 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -72,11 +72,14 @@ upgrade_to_experimental_version() {
 build_and_upgrade_to_git_version() {
 	echo
 	echo "$(date -u ) - building torbrowser-launcher from git, branch $BRANCH…"
-	schroot --run-session -c $SESSION --directory $TMPDIR/git -- debuild -b
-	DEB=$(cd $TMPDIR/git ; ls torbrowser-launcher_*deb)
+	schroot --run-session -c $SESSION --directory $TMPDIR/git -- debuild -b -uc -us
+	DEB=$(cd $TMPDIR ; ls torbrowser-launcher_*deb)
+	CHANGES=$(cd $TMPDIR ; ls torbrowser-launcher_*changes)
 	echo "$(date -u ) - installing $DEB…"
-	schroot --run-session -c $SESSION --directory $TMPDIR/git -u root -- dpkg -i $DEB
+	schroot --run-session -c $SESSION --directory $TMPDIR -u root -- dpkg -i $DEB
 	rm $TMPDIR/git -r
+	cat $TMPDIR/$CHANGES
+	schroot --run-session -c $SESSION --directory $TMPDIR -- dcmd rm $CHANGES
 }
 
 download_and_launch() {
@@ -115,8 +118,8 @@ download_and_launch() {
 	sleep 1
 	update_screenshot
 	xvkbd -text "\r" > /dev/null 2>&1
-	for i in $(seq 1 60) ; do
-		sleep 10
+	for i in $(seq 1 20) ; do
+		sleep 30
 		update_screenshot
 		# this directory only exist once torbrower has been successfully installed
 		STATUS="$(schroot --run-session -c $SESSION -- [ ! -d $HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser ] || echo '$(date -u ) - torbrowser downloaded and installed.')"
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index c90d9e6..5bc6a23 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -177,19 +177,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 awesome dbus xterm x11-utils libnotify-bin build-essential devscripts python-all debhelper dh-apparmor'
+            my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-unstable unstable torbrowser-launcher ca-certificates awesome dbus xterm x11-utils libnotify-bin build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release'
             my_recipients: 'holger at 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 awesome dbus xterm x11-utils libnotify-bin build-essential devscripts python-all debhelper dh-apparmor'
+            my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-stretch stretch torbrowser-launcher ca-certificates awesome dbus xterm x11-utils libnotify-bin build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release'
             my_recipients: 'holger at 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 awesome dbus xterm x11-utils libnotify-bin build-essential devscripts python-all debhelper dh-apparmor'
+            my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-jessie jessie torbrowser-launcher ca-certificates awesome dbus xterm x11-utils libnotify-bin build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release'
             my_recipients: 'holger at layer-acht.org'
             my_node: ''
         - '{name}_test_experimental_amd64':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git