Skip to content

Commit

Permalink
update ci ubuntu images from 20.04 to 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
walshmm committed Apr 28, 2023
1 parent 35e8a8c commit 0d34f66
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci-github-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,32 @@ jobs:
include:
- jobname: GCC9-NoMPI-Debug-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC9-NoMPI-NoOMP-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC9-NoMPI-NoOMP-Complex
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC9-NoMPI-Sandbox-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC9-MPI-Gcov-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC9-MPI-Gcov-Complex
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: GCC11-NoMPI-Werror-Real
Expand All @@ -90,22 +90,22 @@ jobs:

- jobname: Clang10-NoMPI-ASan-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: Clang10-NoMPI-ASan-Complex
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: Clang10-NoMPI-UBSan-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-openmpi
image: walshmm/qmcpack-ci:ubuntu22-openmpi
options: -u 1001

- jobname: Clang12-NoMPI-Offload-Real
container:
image: williamfgc/qmcpack-ci:ubuntu20-clang-latest
image: walshmm/qmcpack-ci:ubuntu22-clang-latest
options: -u 1001

steps:
Expand Down
46 changes: 46 additions & 0 deletions config/docker/dependencies/ubuntu22/clang-latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
FROM ubuntu:22.04

RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get update -y &&\
apt-get upgrade -y apt-utils &&\
apt-get install -y gpg wget

# Dependencies
RUN wget https://apt.kitware.com/kitware-archive.sh &&\
sh kitware-archive.sh

RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get install gcc g++ \
python3 \
cmake \
ninja-build \
libboost-all-dev \
git \
libhdf5-serial-dev \
hdf5-tools \
libfftw3-dev \
libopenblas-openmp-dev \
libxml2-dev \
sudo \
curl \
rsync \
wget \
software-properties-common \
vim \
-y

# add the latest clang development
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - &&\
apt-add-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main'
RUN apt-get update -y &&\
apt-get install clang-12 clang-tools-12 libomp-12-dev -y

# must add a user different from root
# to run MPI executables
RUN useradd -ms /bin/bash user
# allow in sudoers to install packages
RUN adduser user sudo
RUN echo "user:user" | chpasswd

USER user
WORKDIR /home/user
60 changes: 60 additions & 0 deletions config/docker/dependencies/ubuntu22/openmpi/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
FROM ubuntu:22.04

RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get clean &&\
apt-get update -y &&\
apt-get upgrade -y apt-utils &&\
apt-get install -y gpg wget

# Dependencies
RUN wget https://apt.kitware.com/kitware-archive.sh &&\
sh kitware-archive.sh

RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get install gcc g++ \
clang \
clang-format \
clang-tidy \
libomp-dev \
gcovr \
python3 \
cmake \
ninja-build \
libboost-all-dev \
git \
libopenmpi-dev \
libhdf5-openmpi-dev \
libhdf5-serial-dev \
hdf5-tools \
libfftw3-dev \
libopenblas-openmp-dev \
libxml2-dev \
sudo \
curl \
rsync \
wget \
software-properties-common \
vim \
numdiff \
-y

# Python packages for tests
RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get install python3-numpy \
python3-h5py \
python3-pandas \
python3-pip \
-y

RUN export DEBIAN_FRONTEND=noninteractive &&\
pip3 install cif2cell

# must add a user different from root
# to run MPI executables
RUN useradd -ms /bin/bash user
# allow in sudoers to install packages
RUN adduser user sudo
RUN echo "user:user" | chpasswd

USER user
WORKDIR /home/user

0 comments on commit 0d34f66

Please sign in to comment.