summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-18 15:39:36 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-18 15:39:36 +0100
commit3c570978e14d45ffbadaa93f22af0d72d6e10ea9 (patch)
treee5424871f2e50e57fe0a90869ddf62cf0466f031
parent692a85f26dae7cd2ccd76cde5d8d2c00ff04eac1 (diff)
downloadjenkins.debian.net-3c570978e14d45ffbadaa93f22af0d72d6e10ea9.tar.xz
torbrowser tests: add new job to test tbb-l which is build using the upstream master branch, in which the debian/experimental branch is merged into
-rw-r--r--TODO2
-rwxr-xr-xbin/test_torbrowser-launcher.sh31
-rw-r--r--job-cfg/torbrowser-launcher.yaml11
3 files changed, 37 insertions, 7 deletions
diff --git a/TODO b/TODO
index e48188f3..f82cf079 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
* replace amd64 in scripts with $HOSTARCH
* extend /etc/rc.local to do cleanup of lockfiles
* explain in README how to write jobs, eg which pathes are on tmpfs
+** EXECUTOR_NUMBER for X
* fix apache ssl configuration as hinted by eg https://sslcheck.globalsign.com/en/sslcheck?host=jenkins.debian.net#78.137.96.196
* run all bash scripts with set -u and set -o pipefail: http://redsymbol.net/articles/unofficial-bash-strict-mode/
* teach bin/chroot-*.sh how to nicely deal with network problems… (as both reproducible_build.sh and schroot-create.sh do)
@@ -411,7 +412,6 @@ The following ideas should really only be implemented for the new 'lvc*' tests..
=== torbrowser-launcher_*
-* new job: merge debian branch in upstream master branch, build a package and install it
* not sure how to test updates. maybe just run in yesterdays schroot before upgrading
* notifications should go somewhere public, after a while of testing.
* debug why iceweasel is needed to be installed… and ca-certificates too.
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 4b4fc226..8814234c 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -264,6 +264,13 @@ download_and_launch() {
echo
}
+prepare_git_workspace_copy() {
+ echo "$(date -u) - preparing git workspace copy."
+ git branch -av
+ mkdir $TMPDIR/git
+ cp -r * $TMPDIR/git
+}
+
#
# prepare
#
@@ -281,15 +288,27 @@ VIDEO=test-torbrowser-${SUITE}_$STARTTIME.mpg
SIZE=1024x768
SCREEN=$EXECUTOR_NUMBER
if [ "$2" = "git" ] ; then
- if [ -z "$3" ] ; then
- BRANCH=master
+ if [ "$3" = "merge" ] ; then
+ ORIG_BRANCH=$(git branch|cut -d " " -f2)
+ BRANCH=upstream-master-plus-debian-packaging
+ COMMIT_HASH=$(git log -1 --oneline|cut -d " " -f1)
+ COMMIT_MSG="Automatically build by jenkins using $4 merged into $COMMIT_HASH."
+ git checkout $BRANCH
+ git remote add debian git://git.debian.org/git/collab-maint/torbrowser-launcher.git
+ git fetch debian
+ git merge --no-edit debian/$4
+ BUILD_VERSION="$(dpkg-parsechangelog |grep ^Version:|cut -d " " -f2).0~jenkins-test-$COMMIT_HASH"
+ dch -R $COMMIT_MSG
+ dch -v $BUILD_VERSION "Automate all the tests."
+ prepare_git_workspace_copy
+ # revert to original branch
+ git reset --hard
+ git checkout $ORIG_BRANCH
+ git branch -D $BRANCH
else
BRANCH=$3
+ prepare_git_workspace_copy
fi
- echo "$(date -u) - preserving git workspace."
- git branch -av
- mkdir $TMPDIR/git
- cp -r * $TMPDIR/git
elif [ "$SUITE" = "experimental" ] || [ "$2" = "experimental" ] ; then
SUITE=unstable
UPGRADE_SUITE=experimental
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 696260b1..14c6ad94 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -170,6 +170,10 @@
name: '{name}_test_on_unstable_amd64_from_git_branch_debian_sid'
- job-template:
+ defaults: torbrowser-launcher_git
+ name: '{name}_test_on_unstable_amd64_from_git_branch_upstream_master'
+
+- job-template:
defaults: torbrowser-launcher_packages
name: '{name}_test_on_stretch_amd64'
@@ -247,6 +251,13 @@
my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git'
my_recipients: 'holger@layer-acht.org'
my_node: ''
+ - '{name}_test_on_unstable_amd64_from_git_branch_upstream_master':
+ my_description: 'Test torbrowser-launcher on unstable/amd64 using the upstream master branch, in which the debian/experimental branch is merged into.'
+ my_gitrepo: 'git://github.com/micahflee/torbrowser-launcher'
+ my_gitbranch: 'master'
+ my_shell: '/srv/jenkins/bin/test_torbrowser-launcher.sh unstable git merge debian/experimental'
+ my_recipients: 'holger@layer-acht.org'
+ my_node: ''
- '{name}_test_on_stretch_amd64':
my_description: 'Test torbrowser-launcher from and on stretch/amd64.'
my_timed: '23 3 * * *'