<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins-build-amarisoft.sh: Allow generating trial without lteue<br><br>Some Amarisoft bundles may come without lteue in it. Allow the script to<br>run if that's the case by setting an envvar.<br><br>Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3<br>---<br>M contrib/jenkins-build-amarisoft.sh<br>1 file changed, 14 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/39/19239/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh</span><br><span>index c210c4c..fe106f1 100755</span><br><span>--- a/contrib/jenkins-build-amarisoft.sh</span><br><span>+++ b/contrib/jenkins-build-amarisoft.sh</span><br><span>@@ -4,6 +4,7 @@</span><br><span> amarisoft_tgz="$1"</span><br><span> </span><br><span> BUILD_AMARISOFT_TRX_ZMQ="${BUILD_AMARISOFT_TRX_ZMQ:-1}"</span><br><span style="color: hsl(120, 100%, 40%);">+HAVE_AMARISOFT_LTEUE="${HAVE_AMARISOFT_LTEUE:-1}"</span><br><span> </span><br><span> if [ ! -f "$amarisoft_tgz" ]; then</span><br><span>         echo "Amarisoft tgz doesn't exist: $amarisoft_tgz"</span><br><span>@@ -57,18 +58,20 @@</span><br><span> md5sum "$tar" > "${this}.md5"</span><br><span> </span><br><span> # Create amarisoftue inst:</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/</span><br><span style="color: hsl(0, 100%, 40%);">-if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-        cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/</span><br><span style="color: hsl(0, 100%, 40%);">-        cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so</span><br><span style="color: hsl(0, 100%, 40%);">-        patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x${HAVE_AMARISOFT_LTEUE}" = "x1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+        rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+        tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/</span><br><span style="color: hsl(120, 100%, 40%);">+        if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+                cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/</span><br><span style="color: hsl(120, 100%, 40%);">+                cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so</span><br><span style="color: hsl(120, 100%, 40%);">+                patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so</span><br><span style="color: hsl(120, 100%, 40%);">+        fi</span><br><span style="color: hsl(120, 100%, 40%);">+        cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/</span><br><span style="color: hsl(120, 100%, 40%);">+        this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span style="color: hsl(120, 100%, 40%);">+        tar="${this}.tgz"</span><br><span style="color: hsl(120, 100%, 40%);">+        tar -czf "$tar" -C inst-amarisoftue/ .</span><br><span style="color: hsl(120, 100%, 40%);">+        md5sum "$tar" > "${this}.md5"</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/</span><br><span style="color: hsl(0, 100%, 40%);">-this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span style="color: hsl(0, 100%, 40%);">-tar="${this}.tgz"</span><br><span style="color: hsl(0, 100%, 40%);">-tar -czf "$tar" -C inst-amarisoftue/ .</span><br><span style="color: hsl(0, 100%, 40%);">-md5sum "$tar" > "${this}.md5"</span><br><span> </span><br><span> # Create amarisoftepc inst:</span><br><span> rm -rf inst-amarisoftepc && mkdir inst-amarisoftepc || exit 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19239">change 19239</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-gsm-tester/+/19239"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I363b44cd8aa48f80d24219b6bf5b3ebde580e3c3 </div>
<div style="display:none"> Gerrit-Change-Number: 19239 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>