[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: cd into correct workspace

[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 65dd084f70570c22953b4864cb662f4282c3fd1d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 25 20:56:11 2016 +0100

    reproducible fdroid: cd into correct workspace
---
 TODO                                               | 3 ++-
 bin/reproducible_setup_fdroid_build_environment.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index d440666..d08876b 100644
--- a/TODO
+++ b/TODO
@@ -320,7 +320,8 @@ notes on source and binary versions:
 ** ./makebuildserver
 *** this downloads a base debian image and all Android tarballs (SDK, NDK, Gradle...)
 *** then enters the image, installs all debian packages and Android stuff from the cached tarballs
-** cache is kept outside (~/.cache/fdroidserver) but installed inside
+** cache is kept outside ('~/.cache/fdroidserver') but installed inside
+** '~/.cache/fdroidserver' needs to be cleaned at some times…
 
 * reproducible_build_fdroid_apk.sh
 ** 1st run ./fdroid build some.app:vercode --server
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index b1ff481..d4c8d14 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -16,7 +16,6 @@ common_init "$@"
 # define work space (differently than jenkins would normally do as we run via ssh on a different node…)
 WORKSPACE=$BASE/fdroid
 mkdir -p $WORKSPACE
-cd $WORKSPACE
 
 # make sure we have the vagrant box image cached
 test -e ~/.cache/fdroidserver || mkdir -p ~/.cache/fdroidserver
@@ -30,6 +29,7 @@ export VAGRANT_HOME=$WORKSPACE/vagrant.d
 rm -rf $VAGRANT_HOME
 
 # FIXME: the git cloning should be part of the jenkins job…
+cd $WORKSPACE
 git clone https://gitlab.com/fdroid/fdroidserver.git
 cd fdroidserver
 ./makebuildserver 

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