Change in osmo-gsm-tester[master]: contrib/jenkins-build-amarisoft.sh: Make build of amarisoft trx_zmq.s...

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17712 )


Change subject: contrib/jenkins-build-amarisoft.sh: Make build of amarisoft trx_zmq.so optional
......................................................................

contrib/jenkins-build-amarisoft.sh: Make build of amarisoft trx_zmq.so optional

That module is only available so far in a private repository, so allow
still other amarisof tusers to build the bundles with UHD support.

Change-Id: I361f179c8e7f379173fa9109028e139fc4c8c251
---
M contrib/jenkins-build-amarisoft.sh
1 file changed, 27 insertions(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/17712/1

diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh
index ee26f45..1e22ed5 100755
--- a/contrib/jenkins-build-amarisoft.sh
+++ b/contrib/jenkins-build-amarisoft.sh
@@ -3,35 +3,38 @@
 
 amarisoft_tgz="$1"
 
+BUILD_AMARISOFT_TRX_ZMQ="${BUILD_AMARISOFT_TRX_ZMQ:-1}"
+
 if [ ! -f "$amarisoft_tgz" ]; then
         echo "Amarisoft tgz doesn't exist: $amarisoft_tgz"
         exit 1
 fi
 
 base="$PWD"
-name="srslte"
-git_url="${git_url:-https://github.com/srsLTE}"
-project_name_srslte="${project_name:-srsLTE}"
-. "$(dirname "$0")/jenkins-build-common.sh"
+if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then
+        name="srslte"
+        git_url="${git_url:-https://github.com/srsLTE}"
+        project_name_srslte="${project_name:-srsLTE}"
+        . "$(dirname "$0")/jenkins-build-common.sh"
 
-#TODO: make sure libconfig, zeroMQ is installed
-build_repo $project_name_srslte
+        #TODO: make sure libconfig, zeroMQ is installed
+        build_repo $project_name_srslte
 
-git_url="git at github.com:softwareradiosystems"
-project_name_zmq="amarisoft_dummy_trx"
-branch="trx_zmq"
-have_repo $project_name_zmq $branch
-cd $project_name_zmq
-rm -rf build && mkdir build && cd build || exit 1
-cmake -DSRSLTE_BUILD_PATH=${base}/${project_name_srslte}/build ../
-make -j8
-cd $base
+        git_url="git at github.com:softwareradiosystems"
+        project_name_zmq="amarisoft_dummy_trx"
+        branch="trx_zmq"
+        have_repo $project_name_zmq $branch
+        cd $project_name_zmq
+        rm -rf build && mkdir build && cd build || exit 1
+        cmake -DSRSLTE_BUILD_PATH=${base}/${project_name_srslte}/build ../
+        make -j8
+        cd $base
+fi
 
 rm -rf inst-tmp && mkdir inst-tmp
 rm -rf inst-tmp-uhd && mkdir inst-tmp-uhd
 tar -zxf $amarisoft_tgz -C inst-tmp/
 tar -zxf inst-tmp/*/trx_uhd*.tar.gz -C inst-tmp/
-#tar -zxf inst-tmp/trx_uhd-linux*/trx_uhd.so.tar.gz -C inst-tmp-uhd/
 
 # Build trx_uhd.so:
 cd ${base}/inst-tmp/trx_uhd-linux*/
@@ -41,8 +44,10 @@
 # Create amarisoftenb inst:
 rm -rf inst-amarisoftenb && mkdir inst-amarisoftenb || exit 1
 tar --strip-components=1 -zxf inst-tmp/*/lteenb-linux*.tar.gz -C inst-amarisoftenb/
-cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftenb/
-cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftenb/trx_zmq.so
+if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then
+        cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftenb/
+        cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftenb/trx_zmq.so
+fi
 cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftenb/
 this="amarisoftenb.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"
 tar="${this}.tgz"
@@ -52,8 +57,10 @@
 # Create amarisoftue inst:
 rm -rf inst-amarisoftue && mkdir inst-amarisoftue || exit 1
 tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue/
-cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/
-cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so
+if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then
+        cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/
+        cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so
+fi
 cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftenb/
 this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"
 tar="${this}.tgz"

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17712
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I361f179c8e7f379173fa9109028e139fc4c8c251
Gerrit-Change-Number: 17712
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200403/ae154591/attachment.htm>