From a8153577fec40c83193dddc69a0adc829dd57c7e Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Fri, 20 Sep 2019 10:43:03 +0200
Subject: gerrit, master builds: use stretch, not jessie

Debian jessie (8) is EOL already, so switch to stretch (9). This is
required to build all Osmocom projects in docker, because at least
libosmocore fails to build with the old image (tests won't build with
GCC-4.9.x from jessie unless -Werror is disabled).

Do not build the jessie image anymore, and update the shared dockerfile.
Remove everything jessie specific, and make it work with stretch by
installing asciidoc-dblatex. Otherwise we get this error when building
manuals:

a2x: ERROR: missing configuration file: /etc/asciidoc/dblatex/asciidoc-dblatex.xsl

Add '--cap-add SYS_PTRACE' argument to the docker run command, because
otherwise the address sanitizer isn't working anymore with stretch
(which makes the OsmoPCU tests fail).

I've tried to split this patch up into multiple ones, but since there is
no asciidoc-dblatex package in jessie, we must add the dependency and
switch the image at the same time.

Related: OS#3726
Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d
---
 jobs/gerrit-verifications.yml | 4 +++-
 jobs/master-builds.yml        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'jobs')

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 0f97c23..693d3c3 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -20,10 +20,12 @@
     combination_filter: ''
     sequential: false
     # most common build invocation
+    # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764)
     docker_run: |
             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
             mkdir -p "$ARTIFACT_STORE"
             docker run --rm=true \
+              --cap-add SYS_PTRACE \
               -e ARTIFACT_STORE=/artifact_store \
               -e ASCIIDOC_WARNINGS_CHECK="1" \
               -e HOME=/build \
@@ -36,7 +38,7 @@
               -w /build -i -u build \
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
-    docker_img: 'osmocom:amd64'
+    docker_img: 'osmocom:deb9_amd64'
     cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
     repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'
     gerrit_project: '{repos}'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 8651337..5a47028 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -19,10 +19,12 @@
     combination_filter: ''
     sequential: false
     # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)
+    # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764)
     docker_run: |
             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
             mkdir -p "$ARTIFACT_STORE"
             docker run --rm=true \
+              --cap-add SYS_PTRACE \
               -e ARTIFACT_STORE=/artifact_store \
               -e ASCIIDOC_WARNINGS_CHECK="1" \
               -e HOME=/build \
@@ -37,7 +39,7 @@
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
-    docker_img: 'osmocom:amd64'
+    docker_img: 'osmocom:deb9_amd64'
     cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
     wrappers: []
     trigger:
-- 
cgit v1.2.3