diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-01-06 17:49:23 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-01-06 17:49:23 +0100 |
| commit | 1f835ed97d83177ae935fa95952b7d42191402c4 (patch) | |
| tree | bbc55a81dd604cf278be3278bcb222afc843673c | |
| parent | 002beaa75d6897a3fe911839240a5a76d5c4dbf9 (diff) | |
| download | jenkins.debian.net-1f835ed97d83177ae935fa95952b7d42191402c4.tar.xz | |
torbrowser tests: use git-buildpackage, to automatically create the orig.gz when building from git
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 2 | ||||
| -rw-r--r-- | job-cfg/torbrowser-launcher.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index e72ee653..58c18798 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -112,7 +112,7 @@ upgrade_to_package_build_from_git() { # GIT_URL is set by jenkins echo "$(date -u ) - building Debian package based on branch $BRANCH from $GIT_URL." # build package - schroot --run-session -c $SESSION --directory $TMPDIR/git -- debuild -uc -us + schroot --run-session -c $SESSION --directory $TMPDIR/git -- git-buildpackage --git-ignore-branch --git-upstream-branch=master --git-upstream-tree=branch -uc -us # install it local DEB=$(cd $TMPDIR ; ls torbrowser-launcher_*deb) local CHANGES=$(cd $TMPDIR ; ls torbrowser-launcher_*changes) diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index c278802c..de1255ca 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -161,7 +161,7 @@ my_postfix: ' python python-gtk2 python-psutil python-twisted python-lzma gnupg wmctrl tor' } my_description: 'Setup {dist}/amd64 schroot for testing torbrowser-launcher.' my_timed: '42 {my_hour} * * {my_weekday}' - my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-{dist} {dist}{my_prefix} ca-certificates awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin figlet build-essential fakeroot devscripts python-all debhelper dh-apparmor lsb-release iceweasel{my_postfix}' + my_shell: '/srv/jenkins/bin/schroot-create.sh torbrowser-launcher torbrowser-launcher-{dist} {dist}{my_prefix} ca-certificates awesome dbus xterm x11-utils x11-xserver-utils feh libnotify-bin figlet build-essential fakeroot devscripts git-buildpackage python-all debhelper dh-apparmor lsb-release iceweasel{my_postfix}' - '{name}_test_on_{dist}_amd64{opt_name}': opt_name: '' opt_arg: '' |