Kill hardcoded dir

Author: eisenhauer

.github/workflows/everything.yml

@@ -114,7 +114,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     container:
-      image: ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-${{ matrix.compiler }}
+      image: ghcr.io/ornladios/adios2:ci-tmp-spack-${{ matrix.os }}-${{ matrix.compiler }}
       options: --shm-size=1g
       env:
         GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}

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

@@ -6,6 +6,7 @@ ARG E4S_VERSION=23.08
 ARG ENABLED_ENVS="serial,ompi,mpich"
 ARG EXTERNAL_PACKAGES
 ARG EXTRA_VARIANTS
+ARG PATCH_VARIANT_XROOTD
 
 
 # Clone and patch spack
@@ -24,11 +25,10 @@ COPY packages.yaml /etc/spack/packages.yaml
 WORKDIR /spack
 # TODO: Patch only needed until we merge https://github.com/spack/spack/pull/40964
 RUN if [ ${E4S_VERSION%.*} -le 23 ]; then git apply 0001-mpich-support-ch3-sock.patch; fi
-
+RUN if [ -n "${PATCH_VARIANT_XROOTD}" ]; then git apply 0002-adios2-add-xrootd-variant.patch; fi
 # Install base specs
 RUN . /spack/share/spack/setup-env.sh && \
     if test -n "${EXTERNAL_PACKAGES}"; then spack external find ${EXTERNAL_PACKAGES}; fi && \
-    git apply 0002-adios2-add-xrootd-variant.patch && \
     spack mirror add E4S "https://cache.e4s.io/${E4S_VERSION}" && \
     export ADIOS_SPEC_NO_MPI="adios2~mpi${EXTRA_VARIANTS}" && \
     export ADIOS_SPEC_OPENMPI="adios2+mpi${EXTRA_VARIANTS} ^openmpi" && \

scripts/ci/images/build-ubuntu.sh

@@ -3,7 +3,12 @@
 set -ex
 
 # Build the base image
-docker build --progress=plain --build-arg EXTRA_VARIANTS="+blosc+ssc ^mgard@2023-01-10" --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base .
+docker build --progress=plain \
+  --build-arg EXTRA_VARIANTS="+blosc+ssc ^mgard@2023-01-10" \
+  --build-arg PATCH_VARIANT_XROOTD=ON \
+  --rm -f ./Dockerfile.ci-spack-ubuntu20.04-base \
+  -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base \
+  .
 
 # Build the gcc8, gcc9, and gcc10 images
 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 .
@@ -22,15 +27,14 @@ docker build \
   --build-arg E4S_VERSION="24.05" \
   --build-arg EXTRA_VARIANTS="+blosc2" \
   -f ./Dockerfile.ci-spack-ubuntu20.04-base \
-  -t ghcr.io/ornladios/adios2:ci-spack-ubuntu22.04-gcc11 \
+  -t ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu22.04-gcc11 \
   .
 
 # Push images to github container registry
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-base
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc8
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc9
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc10
-docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-gcc11
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang6
 docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu20.04-clang10
-
+docker push ghcr.io/ornladios/adios2:ci-tmp-spack-ubuntu22.04-gcc11

testing/adios2/engine/bp/generateXRootDConfig.sh

@@ -6,7 +6,7 @@ mkdir -p xroot/etc/xrootd
 {
     echo "xrootd.fslib libXrdSsi.so";
     echo ""
-    echo "all.export /home/eisen/xroot/data nolock r/w";
+    echo "all.export ${PWD}/xroot/data nolock r/w";
     echo ""
     echo "oss.statlib -2 libXrdSsi.so";
     echo ""