<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jenkins: clean after upload<br><br>the upload failed because after the firmware were built (make),<br>they where removed (make clean).<br>now they are removed only after the upload.<br><br>Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96<br>---<br>M contrib/jenkins.sh<br>1 file changed, 14 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 5ce5993..bdf2b39 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -36,7 +36,6 @@</span><br><span>         echo</span><br><span>         echo "=============== $board / $app START  =============="</span><br><span>         make BOARD="$board" APP="$app"</span><br><span style="color: hsl(0, 100%, 40%);">-      make BOARD="$board" APP="$app" clean</span><br><span>     echo "=============== $board / $app RES:$? =============="</span><br><span> done</span><br><span> </span><br><span>@@ -56,19 +55,25 @@</span><br><span> make clean</span><br><span> </span><br><span> if [ "x$publish" = "x--publish" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-  echo</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "=============== UPLOAD BUILD  =============="</span><br><span style="color: hsl(0, 100%, 40%);">-  mkdir out/</span><br><span style="color: hsl(0, 100%, 40%);">-  cp firmware/bin/*.bin out/</span><br><span style="color: hsl(120, 100%, 40%);">+  echo</span><br><span style="color: hsl(120, 100%, 40%);">+  echo "=============== UPLOAD BUILD  =============="</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  cat > "$WORKSPACE/known_hosts" <<EOF</span><br><span style="color: hsl(120, 100%, 40%);">+    cat > "$WORKSPACE/known_hosts" <<EOF</span><br><span> [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9</span><br><span> [rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54=</span><br><span> [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX</span><br><span> EOF</span><br><span style="color: hsl(0, 100%, 40%);">-  SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"</span><br><span style="color: hsl(0, 100%, 40%);">-  rsync -avz --delete -e "$SSH_COMMAND" ./out/ binaries@rita.osmocom.org:web-files/simtrace2/firmware/</span><br><span style="color: hsl(0, 100%, 40%);">-  rm -rf out/</span><br><span style="color: hsl(120, 100%, 40%);">+       SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"</span><br><span style="color: hsl(120, 100%, 40%);">+      rsync -avz --delete -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.bin binaries@rita.osmocom.org:web-files/simtrace2/firmware/</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+echo</span><br><span style="color: hsl(120, 100%, 40%);">+echo "=============== FIRMWARE CLEAN  =============="</span><br><span style="color: hsl(120, 100%, 40%);">+cd $TOPDIR/firmware/</span><br><span style="color: hsl(120, 100%, 40%);">+for build in $BUILDS; do</span><br><span style="color: hsl(120, 100%, 40%);">+   board=`echo $build | cut -d "/" -f 1`</span><br><span style="color: hsl(120, 100%, 40%);">+       app=`echo $build | cut -d "/" -f 2`</span><br><span style="color: hsl(120, 100%, 40%);">+ make BOARD="$board" APP="$app" clean</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo-clean-workspace.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10368">change 10368</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10368"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie4421a6fa9207eb541107de9c14f265626f6be96 </div>
<div style="display:none"> Gerrit-Change-Number: 10368 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>