[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible_lede: use correct place/variable to save results

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 39225f470e22a7fc5635792f6c2adf2459c46006
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Sun Nov 5 00:24:26 2017 +0100

    reproducible_lede: use correct place/variable to save results
    
    Results on remote nodes are expected to be under $TMPDIR, which defined
    by openwrt_build. RESULTSDIR is undefined on the remote node
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 bin/reproducible_lede_common.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh
index c4f659f..fbb2a68 100644
--- a/bin/reproducible_lede_common.sh
+++ b/bin/reproducible_lede_common.sh
@@ -130,7 +130,7 @@ node_save_logs() {
 }
 
 # RUN - is b1 or b2. b1 for first run, b2 for second
-# save the images and packages under $REULTSDIR/$RUN
+# save the images and packages under $TMPDIR/$RUN
 # run on the master
 save_lede_results() {
 	RUN=$1
@@ -143,17 +143,17 @@ save_lede_results() {
 			pushd $subtarget || continue
 
 			# save firmware images
-			mkdir -p $RESULTSDIR/$RUN/targets/$target/$subtarget/
+			mkdir -p $TMPDIR/$RUN/targets/$target/$subtarget/
 			for image in $(find * -name "*.bin" -o -name "*.squashfs") ; do
-				cp -p $image $RESULTSDIR/$RUN/targets/$target/$subtarget/
+				cp -p $image $TMPDIR/$RUN/targets/$target/$subtarget/
 			done
 
 			# save subtarget specific packages
 			if [ -d packages ] ; then
 				pushd packages
 				for package in $(find * -name "*.ipk") ; do
-					mkdir -p $RESULTSDIR/$RUN/packages/$target/$subtarget/$(dirname $package)
-					cp -p $package $RESULTSDIR/$RUN/packages/$target/$subtarget/$(dirname $package)/
+					mkdir -p $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)
+					cp -p $package $TMPDIR/$RUN/packages/$target/$subtarget/$(dirname $package)/
 				done
 				popd
 			fi
@@ -171,8 +171,8 @@ save_lede_results() {
 		for feed in * ; do
 			pushd $feed || continue
 			for package in $(find * -name "*.ipk") ; do
-				mkdir -p $RESULTSDIR/$RUN/packages/$arch/$feed/$(dirname $package)
-				cp -p $package $RESULTSDIR/$RUN/packages/$arch/$feed/$(dirname $package)/
+				mkdir -p $TMPDIR/$RUN/packages/$arch/$feed/$(dirname $package)
+				cp -p $package $TMPDIR/$RUN/packages/$arch/$feed/$(dirname $package)/
 			done
 			popd
 		done
@@ -182,22 +182,22 @@ save_lede_results() {
 }
 
 # RUN - is b1 or b2. b1 for first run, b2 for second
-# save the images and packages under $RESULTSDIR/$RUN
+# save the images and packages under $TMPDIR/$RUN
 save_openwrt_results() {
 	RUN=$1
 	cd bin
 	for i in * ; do
 		cd $i
 		# save images
-		mkdir -p $RESULTSDIR/$RUN/$i
+		mkdir -p $TMPDIR/$RUN/$i
 		for j in $(find * -name "*.bin" -o -name "*.squashfs") ; do
-			cp -p $j $RESULTSDIR/$RUN/$i/
+			cp -p $j $TMPDIR/$RUN/$i/
 		done
 		# save packages
 		cd packages
 		for j in $(find * -name "*.ipk") ; do
-			mkdir -p $RESULTSDIR/$RUN/$i/$(dirname $j)
-			cp -p $j $RESULTSDIR/$RUN/$i/$(dirname $j)/
+			mkdir -p $TMPDIR/$RUN/$i/$(dirname $j)
+			cp -p $j $TMPDIR/$RUN/$i/$(dirname $j)/
 		done
 		cd ../..
 	done

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