[Qa-jenkins-scm] [jenkins.debian.net] 07/11: reproducible/openwrt|lede: add openwrt_mktempdir for remote note execution

Holger Levsen holger at layer-acht.org
Tue Aug 2 14:25:02 UTC 2016


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 ee6b19b44fbe82f4b5663c4fe4faf00ceb68cc58
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Sun Jul 31 01:12:39 2016 +0200

    reproducible/openwrt|lede: add openwrt_mktempdir for remote note execution
    
    mktemp is not possible to so
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_openwrt_common.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 53682af..7c47d53 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -9,6 +9,10 @@
 GENERIC_NODE1=profitbricks-build3-amd64.debian.net
 GENERIC_NODE2=profitbricks-build4-amd64.debian.net
 
+openwrt_mktempdir() {
+	mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX
+}
+
 # only called direct on a remote build node
 openwrt_cleanup_tmpdirs() {
 	export TMPDIR=$1
@@ -257,7 +261,7 @@ build_two_times() {
 
 	## first run
 	RUN=b1
-	TMPDIR_B1=$(ssh $GENERIC_NODE1 mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
+	TMPDIR_B1=$(ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_mktempdir)
 	ssh $GENERIC_NODE1 $0 node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
 
 	ssh $GENERIC_NODE1 $0 node openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML
@@ -268,7 +272,7 @@ build_two_times() {
 
 	## second run
 	RUN=b2
-	TMPDIR_B2=$(ssh $HOST_A mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
+	TMPDIR_B2=$(ssh $GENERIC_NODE2 reproducible_$TYPE node openwrt_mktempdir)
 	ssh $GENERIC_NODE2 $0 node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2
 
 	# rsync back logs and images

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



More information about the Qa-jenkins-scm mailing list