Skip to content

Commit

Permalink
switch to ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
tjhei committed Jan 18, 2025
1 parent ff2a3d6 commit 1274984
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pipeline
set -x
mpicxx -v
cmake --version
# Ubuntu 20.04 only ships cmake 3.16 not 3.17:
# Ubuntu 20.04 only ships cmake 3.16 not 3.23:
echo 'PACKAGES="once:cmake ${PACKAGES}"' > local.cfg
rm -rf $WORKSPACE/install
./candi.sh -j 8 -p $WORKSPACE/install
Expand All @@ -67,14 +67,14 @@ pipeline
}
}

stage ("Ubuntu-22.04")
stage ("Ubuntu-24.04")
{
options {timeout(time: 600, unit: 'MINUTES')}
agent
{
dockerfile
{
dir 'contrib/ubuntu2204'
dir 'contrib/ubuntu2404'
}
}

Expand All @@ -88,9 +88,9 @@ pipeline
rm -f local.cfg
rm -rf $WORKSPACE/install/
./candi.sh -j 8 -p $WORKSPACE/install
cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2204.log
cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2404.log
'''
archiveArtifacts artifacts: 'detailed-ubuntu2204.log', fingerprint: true
archiveArtifacts artifacts: 'detailed-ubuntu2404.log', fingerprint: true

sh '''#!/bin/bash
cd $WORKSPACE/install/tmp/build/deal.II-* && make test
Expand Down
22 changes: 22 additions & 0 deletions contrib/ubuntu2404/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ubuntu:24.04

USER root

RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
lsb-release git subversion wget bc libgmp-dev \
build-essential autoconf automake cmake libtool gfortran python3 \
zlib1g-dev \
openmpi-bin openmpi-common libopenmpi-dev \
libblas3 libblas-dev liblapack3 liblapack-dev libsuitesparse-dev \
&& rm -rf /var/lib/apt/lists/*

ARG USER=bob
RUN adduser --disabled-password --gecos '' $USER
RUN adduser $USER sudo; echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

RUN chown -R $USER:$USER /home/$USER
USER $USER
ENV HOME /home/$USER
ENV USER $USER
ENV OMPI_MCA_btl "^vader"
WORKDIR $HOME

0 comments on commit 1274984

Please sign in to comment.