<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21768">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins.sh 'publish' fixes<br><br>* don't install icE1usb files to e1-tracer directory<br>* don't replicate symlinks but copy<br><br>Change-Id: I6dff99dcc2ab465558ad6344ebb9cba73005cf34<br>---<br>M contrib/jenkins.sh<br>1 file changed, 19 insertions(+), 2 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 5bc05f7..1a0750f 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -5,11 +5,25 @@</span><br><span> # * WITH_MANUALS: build manual PDFs if set to "1"</span><br><span> # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"</span><br><span style="color: hsl(120, 100%, 40%);">+   exit 2</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> set -e</span><br><span> </span><br><span> TOPDIR=`pwd`</span><br><span> publish="$1"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+base="$PWD"</span><br><span style="color: hsl(120, 100%, 40%);">+deps="$base/deps"</span><br><span style="color: hsl(120, 100%, 40%);">+inst="$deps/install"</span><br><span style="color: hsl(120, 100%, 40%);">+export deps inst</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-clean-workspace.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir "$deps" || true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # we assume that PATH includes the path to the respective toolchain</span><br><span> </span><br><span> # firmware build</span><br><span>@@ -33,13 +47,14 @@</span><br><span> EOF</span><br><span>   SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48"</span><br><span>         rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/icE1usb/firmware/all/</span><br><span style="color: hsl(0, 100%, 40%);">-    rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@rita.osmocom.org:web-files/e1-tracer/firmware/latest/</span><br><span style="color: hsl(120, 100%, 40%);">+  rsync --archive --copy-links --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@rita.osmocom.org:web-files/icE1usb/firmware/latest/</span><br><span>      rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/e1-tracer/firmware/all/</span><br><span style="color: hsl(0, 100%, 40%);">-        rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@rita.osmocom.org:web-files/e1-tracer/firmware/latest/</span><br><span style="color: hsl(120, 100%, 40%);">+      rsync --verbose --copy-links --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@rita.osmocom.org:web-files/e1-tracer/firmware/latest/</span><br><span> fi</span><br><span> </span><br><span> # manuals build + optional publication</span><br><span> if [ "$WITH_MANUALS" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo-build-dep.sh osmo-gsm-manuals</span><br><span>   make -C doc/manuals clean all</span><br><span>        if [ "$PUBLISH" = "1" ]; then</span><br><span>            make -C doc/manuals publish</span><br><span>@@ -57,3 +72,5 @@</span><br><span>              make -C $d ${GATE_VARS}</span><br><span>      done</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-clean-workspace.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21768">change 21768</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/c/osmo-e1-hardware/+/21768"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1-hardware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6dff99dcc2ab465558ad6344ebb9cba73005cf34 </div>
<div style="display:none"> Gerrit-Change-Number: 21768 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>