<p>ptrkrysik <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/gr-gsm/+/24091">View Change</a></p><div style="white-space:pre-wrap">Approvals:
ptrkrysik: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">travis: Test in Ubuntu 18.04 container<br><br>- Install gnuradio from the new official PPA repository<br> https://launchpad.net/~gnuradio/+archive/ubuntu/gnuradio-releases<br><br>Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885<br>---<br>M .dockerignore<br>M .travis.yml<br>A tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker<br>3 files changed, 53 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.dockerignore b/.dockerignore</span><br><span>index 1b2211d..ef67c26 100644</span><br><span>--- a/.dockerignore</span><br><span>+++ b/.dockerignore</span><br><span>@@ -1 +1,2 @@</span><br><span> build*</span><br><span style="color: hsl(120, 100%, 40%);">+.git</span><br><span>diff --git a/.travis.yml b/.travis.yml</span><br><span>index 182e006..437e66e 100644</span><br><span>--- a/.travis.yml</span><br><span>+++ b/.travis.yml</span><br><span>@@ -9,6 +9,7 @@</span><br><span> # - DOCKERFILE=tests/dockerfiles/Ubuntu_16_04_nolibosmo.docker IMGNAME=ubu16.04-grgsm-nolibosmo</span><br><span> - DOCKERFILE=tests/dockerfiles/Kali.docker IMGNAME=kali-grgsm</span><br><span> # - DOCKERFILE=tests/dockerfiles/Fedora_26.Dockerfile IMGNAME=fedora26-grgsm</span><br><span style="color: hsl(120, 100%, 40%);">+ - DOCKERFILE=tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker IMGNAME=ubuntu_18_04_gnuradio_ppa</span><br><span> </span><br><span> </span><br><span> services:</span><br><span>diff --git a/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker</span><br><span>new file mode 100644</span><br><span>index 0000000..e0f45a5</span><br><span>--- /dev/null</span><br><span>+++ b/tests/dockerfiles/Ubuntu_18_04_gnuradio_ppa.docker</span><br><span>@@ -0,0 +1,51 @@</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ubuntu:18.04</span><br><span style="color: hsl(120, 100%, 40%);">+MAINTAINER Vasil Velichkov</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ software-properties-common && \</span><br><span style="color: hsl(120, 100%, 40%);">+ add-apt-repository --yes ppa:gnuradio/gnuradio-releases && \</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBIAN_FRONTEND=noninteractive apt-get install -y \</span><br><span style="color: hsl(120, 100%, 40%);">+ git \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmake \</span><br><span style="color: hsl(120, 100%, 40%);">+ autoconf \</span><br><span style="color: hsl(120, 100%, 40%);">+ libtool \</span><br><span style="color: hsl(120, 100%, 40%);">+ pkg-config \</span><br><span style="color: hsl(120, 100%, 40%);">+ build-essential \</span><br><span style="color: hsl(120, 100%, 40%);">+ python-docutils \</span><br><span style="color: hsl(120, 100%, 40%);">+ libcppunit-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ swig \</span><br><span style="color: hsl(120, 100%, 40%);">+ doxygen \</span><br><span style="color: hsl(120, 100%, 40%);">+ liblog4cpp5-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ python-scipy \</span><br><span style="color: hsl(120, 100%, 40%);">+ gnuradio-dev gnuradio libgmp-dev libboost-regex-dev liborc-dev libuhd-dev \</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone --branch maint-3.8 --recurse-submodules https://github.com/velichkov/gr-iqbal && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd gr-iqbal && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir build && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd build && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmake -DENABLE_DOXYGEN=OFF .. && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make -j $(nproc) install</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd gr-osmosdr && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir build && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cd build && \</span><br><span style="color: hsl(120, 100%, 40%);">+ cmake -DENABLE_DOXYGEN=OFF .. && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make -j $(nproc) install</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+COPY ./ /src/</span><br><span style="color: hsl(120, 100%, 40%);">+RUN mkdir /src/build</span><br><span style="color: hsl(120, 100%, 40%);">+WORKDIR /src/build</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#PYTHONPATH is needed as gr-osmosdr gets installed in /usr/local/lib/python3/...</span><br><span style="color: hsl(120, 100%, 40%);">+ENV PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cmake .. && \</span><br><span style="color: hsl(120, 100%, 40%);">+ # The parallel build sometimes fails when the .grc_gnuradio</span><br><span style="color: hsl(120, 100%, 40%);">+ # and .gnuradio directories do not exist</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make -j $(nproc) && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ ldconfig && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make CTEST_OUTPUT_ON_FAILURE=1 test</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/gr-gsm/+/24091">change 24091</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/gr-gsm/+/24091"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaa8813ab0ae91b667285ab3ef42ffaa279e3a885 </div>
<div style="display:none"> Gerrit-Change-Number: 24091 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: ptrkrysik <ptrkrysik@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: vvvelichkov <vvvelichkov@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>