<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17712">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins-build-amarisoft.sh: Make build of amarisoft trx_zmq.so optional<br><br>That module is only available so far in a private repository, so allow<br>still other amarisof tusers to build the bundles with UHD support.<br><br>Change-Id: I361f179c8e7f379173fa9109028e139fc4c8c251<br>---<br>M contrib/jenkins-build-amarisoft.sh<br>1 file changed, 27 insertions(+), 20 deletions(-)<br><br></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 ee26f45..1e22ed5 100755</span><br><span>--- a/contrib/jenkins-build-amarisoft.sh</span><br><span>+++ b/contrib/jenkins-build-amarisoft.sh</span><br><span>@@ -3,35 +3,38 @@</span><br><span> </span><br><span> amarisoft_tgz="$1"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+BUILD_AMARISOFT_TRX_ZMQ="${BUILD_AMARISOFT_TRX_ZMQ:-1}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if [ ! -f "$amarisoft_tgz" ]; then</span><br><span> echo "Amarisoft tgz doesn't exist: $amarisoft_tgz"</span><br><span> exit 1</span><br><span> fi</span><br><span> </span><br><span> base="$PWD"</span><br><span style="color: hsl(0, 100%, 40%);">-name="srslte"</span><br><span style="color: hsl(0, 100%, 40%);">-git_url="${git_url:-https://github.com/srsLTE}"</span><br><span style="color: hsl(0, 100%, 40%);">-project_name_srslte="${project_name:-srsLTE}"</span><br><span style="color: hsl(0, 100%, 40%);">-. "$(dirname "$0")/jenkins-build-common.sh"</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%);">+ name="srslte"</span><br><span style="color: hsl(120, 100%, 40%);">+ git_url="${git_url:-https://github.com/srsLTE}"</span><br><span style="color: hsl(120, 100%, 40%);">+ project_name_srslte="${project_name:-srsLTE}"</span><br><span style="color: hsl(120, 100%, 40%);">+ . "$(dirname "$0")/jenkins-build-common.sh"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#TODO: make sure libconfig, zeroMQ is installed</span><br><span style="color: hsl(0, 100%, 40%);">-build_repo $project_name_srslte</span><br><span style="color: hsl(120, 100%, 40%);">+ #TODO: make sure libconfig, zeroMQ is installed</span><br><span style="color: hsl(120, 100%, 40%);">+ build_repo $project_name_srslte</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-git_url="git@github.com:softwareradiosystems"</span><br><span style="color: hsl(0, 100%, 40%);">-project_name_zmq="amarisoft_dummy_trx"</span><br><span style="color: hsl(0, 100%, 40%);">-branch="trx_zmq"</span><br><span style="color: hsl(0, 100%, 40%);">-have_repo $project_name_zmq $branch</span><br><span style="color: hsl(0, 100%, 40%);">-cd $project_name_zmq</span><br><span style="color: hsl(0, 100%, 40%);">-rm -rf build && mkdir build && cd build || exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-cmake -DSRSLTE_BUILD_PATH=${base}/${project_name_srslte}/build ../</span><br><span style="color: hsl(0, 100%, 40%);">-make -j8</span><br><span style="color: hsl(0, 100%, 40%);">-cd $base</span><br><span style="color: hsl(120, 100%, 40%);">+ git_url="git@github.com:softwareradiosystems"</span><br><span style="color: hsl(120, 100%, 40%);">+ project_name_zmq="amarisoft_dummy_trx"</span><br><span style="color: hsl(120, 100%, 40%);">+ branch="trx_zmq"</span><br><span style="color: hsl(120, 100%, 40%);">+ have_repo $project_name_zmq $branch</span><br><span style="color: hsl(120, 100%, 40%);">+ cd $project_name_zmq</span><br><span style="color: hsl(120, 100%, 40%);">+ rm -rf build && mkdir build && cd build || exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ cmake -DSRSLTE_BUILD_PATH=${base}/${project_name_srslte}/build ../</span><br><span style="color: hsl(120, 100%, 40%);">+ make -j8</span><br><span style="color: hsl(120, 100%, 40%);">+ cd $base</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> rm -rf inst-tmp && mkdir inst-tmp</span><br><span> rm -rf inst-tmp-uhd && mkdir inst-tmp-uhd</span><br><span> tar -zxf $amarisoft_tgz -C inst-tmp/</span><br><span> tar -zxf inst-tmp/*/trx_uhd*.tar.gz -C inst-tmp/</span><br><span style="color: hsl(0, 100%, 40%);">-#tar -zxf inst-tmp/trx_uhd-linux*/trx_uhd.so.tar.gz -C inst-tmp-uhd/</span><br><span> </span><br><span> # Build trx_uhd.so:</span><br><span> cd ${base}/inst-tmp/trx_uhd-linux*/</span><br><span>@@ -41,8 +44,10 @@</span><br><span> # Create amarisoftenb inst:</span><br><span> rm -rf inst-amarisoftenb && mkdir inst-amarisoftenb || exit 1</span><br><span> tar --strip-components=1 -zxf inst-tmp/*/lteenb-linux*.tar.gz -C inst-amarisoftenb/</span><br><span style="color: hsl(0, 100%, 40%);">-cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftenb/</span><br><span style="color: hsl(0, 100%, 40%);">-cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftenb/trx_zmq.so</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-amarisoftenb/</span><br><span style="color: hsl(120, 100%, 40%);">+ cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftenb/trx_zmq.so</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftenb/</span><br><span> this="amarisoftenb.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span> tar="${this}.tgz"</span><br><span>@@ -52,8 +57,10 @@</span><br><span> # Create amarisoftue inst:</span><br><span> rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1</span><br><span> tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/</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(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%);">+fi</span><br><span> cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftenb/</span><br><span> this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span> tar="${this}.tgz"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17712">change 17712</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/+/17712"/><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: I361f179c8e7f379173fa9109028e139fc4c8c251 </div>
<div style="display:none"> Gerrit-Change-Number: 17712 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>