diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 16 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 36 |
3 files changed, 44 insertions, 12 deletions
@@ -411,12 +411,12 @@ The following ideas should really only be implemented for the new 'lvc*' tests.. === torbrowser-launcher_* -* test packages from bpo too, maybe just weekly * 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… +* debug why iceweasel is needed to be installed… and ca-certificates too. +* notifications to somewhere public == Further ideas... diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index 3179149a..6de6c1c5 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -81,12 +81,13 @@ end_session() { sleep 1 } -upgrade_to_experimental_version() { +upgrade_to_newer_packaged_version_in() { + local SUITE=$1 echo - echo "$(date -u ) - upgrading to torbrowser-launcher from experimental…" - echo "deb $MIRROR experimental main contrib" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/apt/sources.list + echo "$(date -u ) - upgrading to torbrowser-launcher from $SUITE" + echo "deb $MIRROR $SUITE main contrib" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/apt/sources.list schroot --run-session -c $SESSION --directory /tmp -u root -- apt-get update - schroot --run-session -c $SESSION --directory /tmp -u root -- apt-get -y install -t experimental torbrowser-launcher + schroot --run-session -c $SESSION --directory /tmp -u root -- apt-get -y install -t $SUITE torbrowser-launcher } build_and_upgrade_to_git_version() { @@ -267,6 +268,9 @@ if [ "$2" = "git" ] ; then elif [ "$SUITE" = "experimental" ] || [ "$2" = "experimental" ] ; then SUITE=unstable EXPERIMENTAL=yes +elif [ "$2" = "backports" ] ; then + SUITE=unstable + BACKPORTS=yes fi WORKSPACE=$(pwd) RESULTS=$WORKSPACE/results @@ -284,7 +288,9 @@ begin_session if [ "$2" = "git" ] ; then build_and_upgrade_to_git_version elif [ "$EXPERIMENTAL" = "yes" ] ; then - upgrade_to_experimental_version + upgrade_to_newer_packaged_version_in experimental +elif [ "$BACKPORTS" = "yes" ] ; then + upgrade_to_newer_packaged_version_in $SUITE-backports fi download_and_launch end_session diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 3a5b9e5f..b920bae7 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -161,6 +161,10 @@ - job-template: defaults: torbrowser-launcher_packages + name: '{name}_test_on_jessie_amd64_from_backports' + +- job-template: + defaults: torbrowser-launcher_packages name: '{name}_test_on_jessie_amd64_from_experimental' - job-template: @@ -171,6 +175,10 @@ defaults: torbrowser-launcher_git name: '{name}_test_on_jessie_amd64_from_git_branch_debian_sid' +- job-template: + defaults: torbrowser-launcher_packages + name: '{name}_test_on_wheezy_amd64_from_backports' + - project: name: torbrowser-launcher jobs: @@ -192,15 +200,21 @@ my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-jessie jessie torbrowser-launcher 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' my_recipients: 'holger@layer-acht.org' my_node: '' + - '{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_recipients: 'holger@layer-acht.org' + my_node: '' - '{name}_test_on_experimental_amd64': my_description: 'Test torbrowser-launcher from and on experimental/amd64.' - my_timed: '23 5 * * *' + my_timed: '42 3 * * *' my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh experimental' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_test_on_unstable_amd64': my_description: 'Test torbrowser-launcher from and on unstable/amd64.' - my_timed: '23 5 * * *' + my_timed: '23 2 * * *' my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable' my_recipients: 'holger@layer-acht.org' my_node: '' @@ -213,19 +227,25 @@ my_node: '' - '{name}_test_on_stretch_amd64': my_description: 'Test torbrowser-launcher from and on stretch/amd64.' - my_timed: '23 6 * * *' + my_timed: '23 3 * * *' my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh stretch' my_recipients: 'holger@layer-acht.org' my_node: '' - '{name}_test_on_jessie_amd64': my_description: 'Test torbrowser-launcher from and on jessie/amd64.' - my_timed: '23 7 * * *' + my_timed: '23 4 * * *' my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie' my_recipients: 'holger@layer-acht.org' my_node: '' + - '{name}_test_on_jessie_amd64_from_backports': + my_description: 'Test torbrowser-launcher from backports on jessie/amd64.' + my_timed: '42 4 * * 2' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie backports' + my_recipients: 'holger@layer-acht.org' + my_node: '' - '{name}_test_on_jessie_amd64_from_experimental': my_description: 'Test torbrowser-launcher from experimental on jessie/amd64.' - my_timed: '23 8 * * *' + my_timed: '23 5 * * 2' my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie experimental' my_recipients: 'holger@layer-acht.org' my_node: '' @@ -243,4 +263,10 @@ my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh jessie git' my_recipients: 'holger@layer-acht.org' my_node: '' + - '{name}_test_on_wheezy_amd64_from_backports': + my_description: 'Test torbrowser-launcher from backports on wheezy/amd64.' + my_timed: '23 5 * * 4' + my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh wheezy backports' + my_recipients: 'holger@layer-acht.org' + my_node: '' |