<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15583">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
daniel: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: use stretch, not jessie<br><br>Debian jessie (8) is EOL already, so switch to stretch (9). This is<br>required to build all Osmocom projects in docker, because at least<br>libosmocore fails to build with the old image (tests won't build with<br>GCC-4.9.x from jessie unless -Werror is disabled).<br><br>Do not build the jessie image anymore, and update the shared dockerfile.<br>Remove everything jessie specific, and make it work with stretch by<br>installing asciidoc-dblatex. Otherwise we get this error when building<br>manuals:<br><br>a2x: ERROR: missing configuration file: /etc/asciidoc/dblatex/asciidoc-dblatex.xsl<br><br>Add '--cap-add SYS_PTRACE' argument to the docker run command, because<br>otherwise the address sanitizer isn't working anymore with stretch<br>(which makes the OsmoPCU tests fail).<br><br>I've tried to split this patch up into multiple ones, but since there is<br>no asciidoc-dblatex package in jessie, we must add the dependency and<br>switch the image at the same time.<br><br>Related: OS#3726<br>Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d<br>---<br>M docker/Dockerfile_osmocom_jenkins.amd64<br>M docker/rebuild_osmocom_jenkins_image.sh<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>4 files changed, 11 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>index 3f499ad..897db15 100644</span><br><span>--- a/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>+++ b/docker/Dockerfile_osmocom_jenkins.amd64</span><br><span>@@ -1,10 +1,9 @@</span><br><span style="color: hsl(0, 100%, 40%);">-ARG DEBIAN_VERSION=jessie</span><br><span style="color: hsl(120, 100%, 40%);">+ARG DEBIAN_VERSION=stretch</span><br><span> FROM debian:${DEBIAN_VERSION}</span><br><span> </span><br><span> RUN \</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \</span><br><span> dpkg --add-architecture i386 && \</span><br><span style="color: hsl(0, 100%, 40%);">- DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false update && \</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBIAN_FRONTEND=noninteractive apt-get update && \</span><br><span> DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \</span><br><span> DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make</span><br><span> </span><br><span>@@ -29,7 +28,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libortp-dev libpcsclite-dev libsctp-dev libfftw3-dev libsnmp-dev libusb-1.0-0-dev libtalloc-dev libgnutls28-dev</span><br><span> </span><br><span> # OsmocomBB</span><br><span style="color: hsl(0, 100%, 40%);">-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev</span><br><span> </span><br><span> # building</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf</span><br><span>@@ -38,7 +37,7 @@</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip</span><br><span> </span><br><span> # for osmo-gsm-manuals</span><br><span style="color: hsl(0, 100%, 40%);">-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils</span><br><span style="color: hsl(120, 100%, 40%);">+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils asciidoc-dblatex</span><br><span> </span><br><span> # Linux kernel</span><br><span> RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc</span><br><span>diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh</span><br><span>index c4e3b10..60c516b 100755</span><br><span>--- a/docker/rebuild_osmocom_jenkins_image.sh</span><br><span>+++ b/docker/rebuild_osmocom_jenkins_image.sh</span><br><span>@@ -22,6 +22,5 @@</span><br><span> build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Create containers using jessie (Debian 8.0) and stretch (Debian 9.0) as base.</span><br><span style="color: hsl(0, 100%, 40%);">-build_container osmocom:amd64 jessie</span><br><span style="color: hsl(120, 100%, 40%);">+# Create containers using stretch (Debian 9.0) as base.</span><br><span> build_container osmocom:deb9_amd64 stretch</span><br><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index 0f97c23..693d3c3 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -20,10 +20,12 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation</span><br><span style="color: hsl(120, 100%, 40%);">+ # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764)</span><br><span> docker_run: |</span><br><span> ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span> mkdir -p "$ARTIFACT_STORE"</span><br><span> docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ --cap-add SYS_PTRACE \</span><br><span> -e ARTIFACT_STORE=/artifact_store \</span><br><span> -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -e HOME=/build \</span><br><span>@@ -36,7 +38,7 @@</span><br><span> -w /build -i -u build \</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span style="color: hsl(0, 100%, 40%);">- docker_img: 'osmocom:amd64'</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_img: 'osmocom:deb9_amd64'</span><br><span> cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'</span><br><span> gerrit_project: '{repos}'</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 8651337..5a47028 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -19,10 +19,12 @@</span><br><span> combination_filter: ''</span><br><span> sequential: false</span><br><span> # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)</span><br><span style="color: hsl(120, 100%, 40%);">+ # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764)</span><br><span> docker_run: |</span><br><span> ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"</span><br><span> mkdir -p "$ARTIFACT_STORE"</span><br><span> docker run --rm=true \</span><br><span style="color: hsl(120, 100%, 40%);">+ --cap-add SYS_PTRACE \</span><br><span> -e ARTIFACT_STORE=/artifact_store \</span><br><span> -e ASCIIDOC_WARNINGS_CHECK="1" \</span><br><span> -e HOME=/build \</span><br><span>@@ -37,7 +39,7 @@</span><br><span> -v "$PWD:/build" -v "$HOME/bin:/build_bin" \</span><br><span> -v "$ARTIFACT_STORE:/artifact_store" \</span><br><span> -v "$HOME/.ssh:/home/build/.ssh:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">- docker_img: 'osmocom:amd64'</span><br><span style="color: hsl(120, 100%, 40%);">+ docker_img: 'osmocom:deb9_amd64'</span><br><span> cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh</span><br><span> wrappers: []</span><br><span> trigger:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15583">change 15583</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-ci/+/15583"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d </div>
<div style="display:none"> Gerrit-Change-Number: 15583 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>