osmith submitted this change.
debian-bullseye-jenkins: sync with buster-jenkins
Prepare to let jenkins master-builds use debian-bullseye-jenkins
instead of debian-buster-jenkins. Add almost everything from the buster
Dockerfile to the bullseye Dockerfile that is not there, except for:
dh-systemd (not available in debian11)
Also add python2, as some projects still require it to run tests
(OS#5950).
Related: OS#5949
Change-Id: I51925d0ab9e5a779379efab59c381ef12fb60929
---
M debian-bullseye-jenkins/Dockerfile
1 file changed, 56 insertions(+), 4 deletions(-)
diff --git a/debian-bullseye-jenkins/Dockerfile b/debian-bullseye-jenkins/Dockerfile
index 71ee08c..7c02cbe 100644
--- a/debian-bullseye-jenkins/Dockerfile
+++ b/debian-bullseye-jenkins/Dockerfile
@@ -12,6 +12,9 @@
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG DEBIAN_VERSION
+# LLVM-embedded-toolchain-for-Arm version
+ARG LLVM_VERSION="14.0.0"
+
# Install apt dependencies (keep in alphabetic order)
RUN \
[ "$(arch)" = "x86_64" ] && dpkg --add-architecture i386; \
@@ -27,6 +30,7 @@
bison \
bzip2 \
ca-certificates \
+ ccache \
cmake \
coccinelle \
cppcheck \
@@ -43,11 +47,13 @@
gawk \
gcc \
gcc-arm-none-eabi \
+ ghostscript \
git \
git-buildpackage \
graphviz \
htop \
inkscape \
+ latexmk \
lcov \
libaio-dev \
libasound2-dev \
@@ -82,6 +88,7 @@
libsqlite3-dev \
libssl-dev \
libtalloc-dev \
+ libtinfo5 \
libtool \
libusb-1.0-0-dev \
libusb-dev \
@@ -97,6 +104,8 @@
patchelf \
picolibc-arm-none-eabi \
pkg-config \
+ python-setuptools \
+ python2.7 \
python3 \
python3-gi \
python3-mako \
@@ -114,17 +123,34 @@
sudo \
systemd \
tcpdump \
+ tex-gyre \
texinfo \
unzip \
wget \
xsltproc
+RUN set -x && \
+ [ "$(arch)" = "x86_64" ] || exit 0; \
+ wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-${LLVM_VERSION}/LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \
+ tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \
+ rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \
+ mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \
+ /opt/llvm-arm/bin/clang --version && \
+ /opt/llvm-arm/bin/clang --print-targets
+
# Install pip dependencies (keep in alphabetic order)
RUN pip3 install \
- git+https://github.com/podshumok/python-smpplib.git \
- git+https://github.com/eriwen/lcov-to-cobertura-xml.git \
- pydbus \
- pysispm
+ 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \
+ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \
+ 'git+https://github.com/podshumok/python-smpplib.git' \
+ 'pydbus' \
+ 'pylint' \
+ 'pysispm' \
+ 'sphinx' \
+ 'sphinxcontrib-napoleon' \
+ 'swig'
+ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt
+RUN pip3 install -r /tmp/pysim_requirements.txt
# match the outside user
RUN useradd --uid=1000 build
@@ -133,6 +159,14 @@
RUN mkdir /build
RUN chown build:build /build
+# Install osmo-python-tests for python2 (OS#5950)
+ARG OSMO_PYTHON2_TESTS_COMMIT=fb4b813d4df62b7b2445bdced961eb1847267eed
+ADD http://git.osmocom.org/python/osmo-python-tests/patch/?id=$OSMO_PYTHON2_TESTS_COMMIT /tmp/osmo-python-tests2-commit
+RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests2 && \
+ cd osmo-python-tests2 && \
+ git checkout $OSMO_PYTHON2_TESTS_COMMIT && \
+ python2 setup.py clean build install
+
# Install osmo-python-tests for python3
ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/osmo-python-tests3-commit
RUN git clone https://gerrit.osmocom.org/python/osmo-python-tests osmo-python-tests3 && \
To view, visit change 31997. To unsubscribe, or for help writing mail filters, visit settings.