Skip to content

Commit ae5b4b1

Browse files
vicenteboleavicentebolea
committed
TEMP: add xrootd to spack imgs
1 parent 30ec94f commit ae5b4b1

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

‎.github/workflows/everything.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114

115115
runs-on: ubuntu-20.04
116116
container:
117-
image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
117+
image: ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-${{ matrix.compiler }}
118118
options: --shm-size=1g
119119
env:
120120
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
@@ -518,7 +518,7 @@ jobs:
518518
name: CodeQL
519519
runs-on: ubuntu-latest
520520
container:
521-
image: 'ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8'
521+
image: 'ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8'
522522
env:
523523
GH_YML_JOBNAME: ubuntu20.04-gcc8-serial-codeql
524524
GH_YML_BASE_OS: Linux

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-base‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ RUN cd spack && \
1616
git apply 0001-mpich-support-ch3-sock.patch && \
1717
. /spack/share/spack/setup-env.sh && \
1818
spack mirror add E4S "https://cache.e4s.io/${E4S_VERSION}" && \
19-
export ADIOS_SPEC_NO_MPI="adios2~mpi" && \
20-
export ADIOS_SPEC_OPENMPI="adios2+mpi^openmpi" && \
21-
export ADIOS_SPEC_MPICH="adios2+mpi^mpich" && \
19+
export EXTRA_SPECS="xrootd" && \
20+
export ADIOS_SPEC_OPENMPI="adios2+mpi^openmpi ${EXTRA_SPECS}" && \
21+
export ADIOS_SPEC_MPICH="adios2+mpi^mpich ${EXTRA_SPECS}" && \
22+
export ADIOS_SPEC_NO_MPI="adios2~mpi ${EXTRA_SPECS}" && \
23+
export ADIOS_SPEC_OPENMPI="adios2+mpi^openmpi ${EXTRA_SPECS}" && \
24+
export ADIOS_SPEC_MPICH="adios2+mpi^mpich ${EXTRA_SPECS}" && \
2225
spack config add "config:checksum:false" && \
2326
spack config add "config:build_jobs:$(nproc)" && \
2427
spack config add "concretizer:unify:true" && \

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-clang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
22
ARG CLANG_VERSION=10
33

44
RUN apt-get update && apt-get install -y \

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-gcc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
22
ARG GCC_VERSION=8
33

44
RUN apt-get update && apt-get install -y \

‎scripts/ci/images/Dockerfile.ci-spack-ubuntu20.04-intel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
1+
FROM ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
22

33
RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg && \
44
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list && \

‎scripts/ci/images/build-ubuntu.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
set -ex
44

55
# Build the base image
6-
docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base .
6+
docker build --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base .
77

88
# Which is also the gcc11 image
9-
docker tag ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
9+
docker tag ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc11
1010

1111
# Build the gcc8, gcc9, and gcc10 images
12-
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8 .
13-
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9 .
14-
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10 .
12+
docker build --rm --build-arg GCC_VERSION=8 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8 .
13+
docker build --rm --build-arg GCC_VERSION=9 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc9 .
14+
docker build --rm --build-arg GCC_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-gcc -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc10 .
1515

1616
# Build the clang6 and clang10 images
17-
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6 .
18-
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10 .
17+
docker build --rm --build-arg CLANG_VERSION=6.0 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang6 .
18+
docker build --rm --build-arg CLANG_VERSION=10 -f ./Dockerfile.ci-spack-ubuntu20.04-clang -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang10 .
1919

2020
# Push images to github container registry
21-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base
22-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8
23-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc9
24-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc10
25-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc11
26-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang6
27-
docker push ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-clang10
21+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
22+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8
23+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc9
24+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc10
25+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc11
26+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang6
27+
docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang10

0 commit comments

Comments
 (0)