Change in ...osmo-ci[master]: gerrit, master builds: use stretch, not jessie

[osmith]

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15583


Change subject: gerrit, master builds: use stretch, not jessie
......................................................................

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 out of
the box with GCC-4.9.x from jessie).

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

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
---
M docker/Dockerfile_osmocom_jenkins.amd64
M docker/rebuild_osmocom_jenkins_image.sh
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
4 files changed, 7 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/15583/1

diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64
index 3f499ad..897db15 100644
--- a/docker/Dockerfile_osmocom_jenkins.amd64
+++ b/docker/Dockerfile_osmocom_jenkins.amd64
@@ -1,10 +1,9 @@
-ARG DEBIAN_VERSION=jessie
+ARG DEBIAN_VERSION=stretch
 FROM debian:${DEBIAN_VERSION}
 
 RUN \
-    echo "deb http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
     dpkg --add-architecture i386 && \
-    DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Check-Valid-Until=false update && \
+    DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends wget make
 
@@ -29,7 +28,7 @@
 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
 
 # OsmocomBB
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev/jessie-backports
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gcc-arm-none-eabi liblua5.3-dev
 
 # building
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends libtool pkg-config automake autoconf
@@ -38,7 +37,7 @@
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip
 
 # for osmo-gsm-manuals
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils asciidoc-dblatex
 
 # Linux kernel
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc
diff --git a/docker/rebuild_osmocom_jenkins_image.sh b/docker/rebuild_osmocom_jenkins_image.sh
index c4e3b10..60c516b 100755
--- a/docker/rebuild_osmocom_jenkins_image.sh
+++ b/docker/rebuild_osmocom_jenkins_image.sh
@@ -22,6 +22,5 @@
 	build_once "-t" "${tag_name}" "--build-arg" DEBIAN_VERSION="${debian_version}"
 }
 
-# Create containers using jessie (Debian 8.0) and stretch (Debian 9.0) as base.
-build_container osmocom:amd64 jessie
+# Create containers using stretch (Debian 9.0) as base.
 build_container osmocom:deb9_amd64 stretch
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 801c793..3a74dd9 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -36,7 +36,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 c0d25a6..c56f93f 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -37,7 +37,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:

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I61fe93863d5367e3b9c01ab4726bb95bd16d891d
Gerrit-Change-Number: 15583
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190920/a95b4986/attachment.htm>