summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-16 18:49:59 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-16 18:49:59 +0100
commit976f414ff946e60d8dd041040e6f81e49812257d (patch)
tree3b1411c179fbab7ad2e7dc3fc6e13de4052f4ac5
parent7fe36639085f55cf71f401b56852ad78205fad3f (diff)
downloadjenkins.debian.net-976f414ff946e60d8dd041040e6f81e49812257d.tar.xz
torbrowser tests: fixup oldstable-backports test
-rw-r--r--TODO6
-rwxr-xr-xbin/test_torbrowser-launcher.sh1
-rw-r--r--job-cfg/torbrowser-launcher.yaml2
3 files changed, 4 insertions, 5 deletions
diff --git a/TODO b/TODO
index 16ea2ffe..7a28c04d 100644
--- a/TODO
+++ b/TODO
@@ -413,10 +413,10 @@ The following ideas should really only be implemented for the new 'lvc*' tests..
* tee tbl-l output and grep for "Download error: Download Error: 404 Not Found" and fail earlier
* not sure how to test updates. maybe just run in yesterdays schroot before upgrading
-* test with python-pygame installed too?
-* run this in qemu and enable apparmor too?
-* debug why iceweasel is needed to be installed… and ca-certificates too.
* notifications to somewhere public
+* debug why iceweasel is needed to be installed… and ca-certificates too.
+* run this in qemu and enable apparmor too?
+* test with python-pygame installed too?
== Further ideas...
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 6de6c1c5..4834db6c 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -269,7 +269,6 @@ elif [ "$SUITE" = "experimental" ] || [ "$2" = "experimental" ] ; then
SUITE=unstable
EXPERIMENTAL=yes
elif [ "$2" = "backports" ] ; then
- SUITE=unstable
BACKPORTS=yes
fi
WORKSPACE=$(pwd)
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index abd35863..428d048f 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -207,7 +207,7 @@
- '{name}_setup_schroot_wheezy_amd64':
my_description: 'Setup wheezy/amd64 schroot for testing torbrowser-launcher.'
my_timed: '42 4 * * 2'
- my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-wheezy wheezy ca-certificates awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release iceweasel python python-gtk2 python-psutil python-twisted python-lzma gnupg wmctrl python-txsocksx python-parsley tor'
+ my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-wheezy wheezy ca-certificates awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release iceweasel python python-gtk2 python-psutil python-twisted python-lzma gnupg wmctrl tor'
my_recipients: 'holger@layer-acht.org'
my_node: ''
- '{name}_test_on_experimental_amd64':