Skip to content
Snippets Groups Projects
Commit a7d6923c authored by Jens Georg's avatar Jens Georg
Browse files

Add Ubuntu 20.04 to the built distributions

For now run in parallel with bionic; We can drop bionic if focal builds
reasonably well
parent 08c2e748
No related branches found
No related tags found
No related merge requests found
FROM ubuntu:focal
ENV http_proxy http://xfelproxy.desy.de:3128
ENV https_proxy http://xfelproxy.desy.de:3128
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get install -y software-properties-common apt-utils && \
add-apt-repository -y universe && \
add-apt-repository -y ppa:git-core/ppa && \
apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
apt-get install -y sudo wget python3-pip locales \
g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \
libboost-all-dev libxml++2.6-dev \
libldap2-dev libzmq3-dev rpcbind \
libreadline-dev \
qtbase5-dev \
python2.7-dev python-numpy python3-dev python3-numpy \
python-pytest \
libxmu6 csh libxrandr2 \
libncurses5-dev \
linux-headers-generic \
graphviz \
clang \
libhdf5-dev \
liblua5.3-dev \
python3-sphinx \
libgsl-dev \
libssl-dev \
libpqxx-dev \
libfftw3-dev \
subversion \
vim-common \
netcat-openbsd \
libarmadillo-dev \
libjsoncpp-dev \
python3-pytest \
libxerces-c-dev && \
useradd -u 30996 msk_jenkins && \
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3 && \
pip3 install meson
RUN echo "Defaults set_home" >> /etc/sudoers && \
echo 'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";' > /etc/apt/apt.conf && \
echo 'http_proxy=http://xfelproxy.desy.de:3128' >> /etc/environment && \
echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
git config --system http.proxy http://xfelproxy.desy.de:3128 && \
git config --system https.proxy http://xfelproxy.desy.de:3128
# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
# Start rpcbind at launch of the container, required for DOOCS
ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]
...@@ -14,7 +14,9 @@ def call(String libraryName, ArrayList<String> dependencyList) { ...@@ -14,7 +14,9 @@ def call(String libraryName, ArrayList<String> dependencyList) {
'xenial-tsan', 'xenial-tsan',
'xenial-asan', 'xenial-asan',
'bionic-Debug', 'bionic-Debug',
'bionic-Release' ] 'bionic-Release',
'focal-Debug',
'focal-Release']
script { script {
node('Docker') { node('Docker') {
......
...@@ -13,7 +13,9 @@ def call() { ...@@ -13,7 +13,9 @@ def call() {
'xenial-tsan', 'xenial-tsan',
'xenial-asan', 'xenial-asan',
'bionic-Debug', 'bionic-Debug',
'bionic-Release' ] 'bionic-Release',
'focal-Debug',
'focal-Release']
pipeline { pipeline {
agent none agent none
...@@ -55,6 +57,9 @@ def transformIntoStep(String buildName) { ...@@ -55,6 +57,9 @@ def transformIntoStep(String buildName) {
if [ "${label}" == "bionic" ]; then if [ "${label}" == "bionic" ]; then
DOOCSARCH=Ubuntu-18.04-x86_64 DOOCSARCH=Ubuntu-18.04-x86_64
fi fi
if [ "${label]" == "focal" ]; then
DOOCSARCH=Ubuntu-20.04-x86_64
fi
echo "export DOOCSARCH=\${DOOCSARCH}" > /export/doocs/doocsarch.env echo "export DOOCSARCH=\${DOOCSARCH}" > /export/doocs/doocsarch.env
sudo -H -u msk_jenkins git clone http://doocs-git.desy.de/cgit/doocs/\${DOOCSARCH}.git sudo -H -u msk_jenkins git clone http://doocs-git.desy.de/cgit/doocs/\${DOOCSARCH}.git
mkdir -p /export/doocs/\${DOOCSARCH}/lib/pkgconfig mkdir -p /export/doocs/\${DOOCSARCH}/lib/pkgconfig
......
...@@ -13,7 +13,10 @@ def call() { ...@@ -13,7 +13,10 @@ def call() {
'xenial-tsan', 'xenial-tsan',
'xenial-asan', 'xenial-asan',
'bionic-Debug', 'bionic-Debug',
'bionic-Release' ] 'bionic-Release',
'focal-Debug',
'focal-Release' ]
pipeline { pipeline {
agent none agent none
......
...@@ -13,6 +13,8 @@ def call(ArrayList<String> dependencyList, String gitUrl='', ...@@ -13,6 +13,8 @@ def call(ArrayList<String> dependencyList, String gitUrl='',
'xenial-asan', 'xenial-asan',
'bionic-Debug', 'bionic-Debug',
'bionic-Release', 'bionic-Release',
'focal-Debug',
'focal-Release',
'tumbleweed-Debug', 'tumbleweed-Debug',
'tumbleweed-Release']) { 'tumbleweed-Release']) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment