Skip to content

Commit 5ce0a68

Browse files
vicenteboleavicentebolea
committed
TEMP: add xrootd to spack imgs
1 parent ba5bbad commit 5ce0a68

File tree

9 files changed

+70
-21
lines changed

9 files changed

+70
-21
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 }}
@@ -517,7 +517,7 @@ jobs:
517517
name: CodeQL
518518
runs-on: ubuntu-latest
519519
container:
520-
image: 'ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-gcc8'
520+
image: 'ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8'
521521
env:
522522
GH_YML_JOBNAME: ubuntu20.04-gcc8-serial-codeql
523523
GH_YML_BASE_OS: Linux

‎scripts/ci/gh-actions/linux-setup.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ find "$local_scripts_dir" -type f -name '*.sh' -perm /a=x -exec ./{} \;
1919
find "$local_scripts_dir" -type f -name '*.cmake' -exec cmake --trace -VV -P {} \;
2020

2121
echo "**********Install dependencies End**********"
22+
23+
useradd user
24+
cat /etc/passwd

‎scripts/ci/images/0002-adios2-add-xrootd-variant.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From dfe014d1eea8b0d0533b7519b4a4f58785e43298 Mon Sep 17 00:00:00 2001
2+
From: Vicente Adolfo Bolea Sanchez <[email protected]>
3+
Date: Tue, 18 Jun 2024 18:23:06 -0400
4+
Subject: [PATCH] adios2: add xrootd variant
5+
6+
---
7+
var/spack/repos/builtin/packages/adios2/package.py | 3 +++
8+
1 file changed, 3 insertions(+)
9+
10+
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
11+
index f6a5aba446..97f8322ff3 100644
12+
--- a/var/spack/repos/builtin/packages/adios2/package.py
13+
+++ b/var/spack/repos/builtin/packages/adios2/package.py
14+
@@ -95,6 +95,7 @@ class Adios2(CMakePackage, CudaPackage):
15+
variant("cuda", default=False, when="@2.8:", description="Enable CUDA support")
16+
variant("python", default=False, description="Enable the Python bindings")
17+
variant("fortran", default=True, description="Enable the Fortran bindings")
18+
+ variant("xrootd", default=True, description="Enable the XRootD")
19+
20+
# Requires mature C++11 implementations
21+
conflicts("%gcc@:4.7")
22+
@@ -148,6 +149,7 @@ class Adios2(CMakePackage, CudaPackage):
23+
depends_on("[email protected]:", when="+mpi +python", type=("build", "run"))
24+
depends_on("aws-sdk-cpp", when="+aws")
25+
depends_on("libcatalyst@2", when="+libcatalyst")
26+
+ depends_on("xrootd~davix", when="+xrootd")
27+
28+
# Fix findmpi when called by dependees
29+
# See https://github.com/ornladios/ADIOS2/pull/1632
30+
@@ -197,6 +199,7 @@ def cmake_args(self):
31+
from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"),
32+
from_variant("BUILD_SHARED_LIBS", "shared"),
33+
from_variant("ADIOS2_USE_AWSSDK", "aws"),
34+
+ from_variant("ADIOS2_USE_XRootD", "xrootd"),
35+
from_variant("ADIOS2_USE_Blosc", "blosc"),
36+
from_variant("ADIOS2_USE_BZip2", "bzip2"),
37+
from_variant("ADIOS2_USE_DataMan", "dataman"),
38+
--
39+
2.35.3
40+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ RUN if ! [ -d /spack ]; then \
1717
fi
1818

1919
COPY 0001-mpich-support-ch3-sock.patch /spack
20+
COPY 0002-adios2-add-xrootd-variant.patch /spack
21+
2022
COPY packages.yaml /etc/spack/packages.yaml
2123

2224
WORKDIR /spack
@@ -26,6 +28,7 @@ RUN if [ ${E4S_VERSION%.*} -le 23 ]; then git apply 0001-mpich-support-ch3-sock.
2628
# Install base specs
2729
RUN . /spack/share/spack/setup-env.sh && \
2830
if test -n "${EXTERNAL_PACKAGES}"; then spack external find ${EXTERNAL_PACKAGES}; fi && \
31+
git apply 0002-adios2-add-xrootd-variant.patch && \
2932
spack mirror add E4S "https://cache.e4s.io/${E4S_VERSION}" && \
3033
export ADIOS_SPEC_NO_MPI="adios2~mpi${EXTRA_VARIANTS}" && \
3134
export ADIOS_SPEC_OPENMPI="adios2+mpi${EXTRA_VARIANTS} ^openmpi" && \

‎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 --progress=plain --build-arg EXTRA_VARIANTS="+blosc+ssc" --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-base .
6+
docker build --progress=plain --build-arg EXTRA_VARIANTS="+blosc+ssc" --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

‎testing/adios2/engine/bp/start_xrootd.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/sh
2+
3+
set -x
4+
25
if [ "$(id -u)" -eq 0 ]; then
36
# we run as root in CI in docker images, this is OK, but we have to tell XRootD that it's OK.
4-
ROOT_ARGS="-R sshd"
7+
XROOTD_USER="daemon"
58
fi
6-
"$1" -b -l /tmp/xroot.log "$ROOT_ARGS" -w "$2" -c "$2"/xroot/etc/xrootd/xrootd-ssi.cfg
9+
"$1" -b -l /tmp/xroot.log -R "$XROOTD_USER" -w "$2" -c "$2"/xroot/etc/xrootd/xrootd-ssi.cfg

0 commit comments

Comments
 (0)