From fecfa2aa51939c6b376a139590370311aad18f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Redon?= <kredon@sysmocom.de>
Date: Tue, 7 Aug 2018 17:44:08 +0200
Subject: jenkins: clean after upload

the upload failed because after the firmware were built (make),
they where removed (make clean).
now they are removed only after the upload.

Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96
---
 contrib/jenkins.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 5ce5993..bdf2b39 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -36,7 +36,6 @@ for build in $BUILDS; do
 	echo
 	echo "=============== $board / $app START  =============="
 	make BOARD="$board" APP="$app"
-	make BOARD="$board" APP="$app" clean
 	echo "=============== $board / $app RES:$? =============="
 done
 
@@ -56,19 +55,25 @@ make
 make clean
 
 if [ "x$publish" = "x--publish" ]; then
-  echo
-  echo "=============== UPLOAD BUILD  =============="
-  mkdir out/
-  cp firmware/bin/*.bin out/
+	echo
+	echo "=============== UPLOAD BUILD  =============="
 
-  cat > "$WORKSPACE/known_hosts" <<EOF
+	cat > "$WORKSPACE/known_hosts" <<EOF
 [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
 [rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=
 [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX
 EOF
-  SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
-  rsync -avz --delete -e "$SSH_COMMAND" ./out/ binaries@rita.osmocom.org:web-files/simtrace2/firmware/
-  rm -rf out/
+	SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"
+	rsync -avz --delete -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.bin binaries@rita.osmocom.org:web-files/simtrace2/firmware/
 fi
 
+echo
+echo "=============== FIRMWARE CLEAN  =============="
+cd $TOPDIR/firmware/
+for build in $BUILDS; do
+	board=`echo $build | cut -d "/" -f 1`
+	app=`echo $build | cut -d "/" -f 2`
+	make BOARD="$board" APP="$app" clean
+done
+
 osmo-clean-workspace.sh
-- 
cgit v1.2.3