Merge branch 'DELPHI-536' into 'master'

enable crb repository on al9 containers and prepare xrd version deployment on cvmfs See merge request !39

Merge branch 'DELPHI-536' into 'master'
7e6fdccd · Ulrich Schwickerath · aed76db6 · ee739876 · 7e6fdccd · 7e6fdccd
Commit 7e6fdccd authored 2 months ago by Ulrich Schwickerath
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ include:
    IMAGEUBUNTU22: gitlab-registry.cern.ch/delphi/docker/builder-ubuntu22:latest
    IMAGEUBUNTU24: gitlab-registry.cern.ch/delphi/docker/builder-ubuntu24:latest
    IMAGEDEBIAN12: gitlab-registry.cern.ch/delphi/docker/builder-debian12:latest
+    IMAGEFED41: gitlab-registry.cern.ch/delphi/docker/builder-fedora41:latest
    GITLAB_ADVANCED_SAST_ENABLED: 'true'

 stages:
@@ -52,3 +53,4 @@ include:
  - CI/al8_64.yml
  - CI/al8_32.yml
  - CI/al8_aarch64.yml
+  - CI/fed41_64_xrd.yml
--- a/CI/al9_64.yml
+++ b/CI/al9_64.yml
@@ -278,6 +278,7 @@ container_al9_64:
  script:
    - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
    - echo "creating container ..."; echo "FROM $IMAGEAL9" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
+    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
    - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/x86_64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_x86_64_os; dnf -y update" >> Dockerfile
    - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile

--- a/CI/al9_64_xrd.yml
+++ b/CI/al9_64_xrd.yml
@@ -240,13 +240,13 @@ binaries_al9_64_xrd:
  script:
    - echo "Packaging binaries..."
    - mv d/releases/almalinux-x86_64-9 .
-    - mv almalinux-x86_64-9 almalinux-x86_64_xrd-9
-    - (cd almalinux-x86_64_xrd-9; rm -rf perl ; ln -s ../../perl)
-    - touch almalinux-x86_64_xrd-9/.cvmfscatalog
+    - mv almalinux-x86_64-9 almalinux-x86_64-9_xrd
+    - (cd almalinux-x86_64-9_xrd; rm -rf perl ; ln -s ../../perl)
+    - touch almalinux-x86_64-9_xrd/.cvmfscatalog
  artifacts:
-    name: almalinux-x86_64_xrd-9
+    name: almalinux-x86_64-9_xrd
    paths:
-      - almalinux-x86_64_xrd-9
+      - almalinux-x86_64-9_xrd

 container_al9_64_xrd:
  image:
@@ -265,13 +265,14 @@ container_al9_64_xrd:
  script:
    - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
    - echo "creating container ..."; echo "FROM $IMAGEAL9" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
+    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
    - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/x86_64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_x86_64_os; dnf -y update" >> Dockerfile
    - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile
    - echo "RUN groupadd delphi" >> Dockerfile; echo 'RUN useradd -m -g delphi delphi' >> Dockerfile; echo "WORKDIR /home/delphi" >> Dockerfile
    - echo "RUN dnf clean all; dnf -y install sudo libGLEW glew-devel procps-ng mesa-dri-drivers tigervnc tigervnc-server xrootd-client" >> Dockerfile; echo "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile
    - echo "RUN cd /home/delphi; git clone https://gitlab.cern.ch/delphi/examples.git; mkdir graexe graexe/data graexe/run graexe/hcopy; chown -R delphi.delphi examples graexe; " >> Dockerfile
-    - echo "RUN chmod 400 /etc/shadow; cd /delphi; ln -s almalinux-x86_64_xrd-9 almalinux-x86_64-9" >> Dockerfile
+    - echo "RUN chmod 400 /etc/shadow; cd /delphi; ln -s almalinux-x86_64-9_xrd almalinux-x86_64-9" >> Dockerfile
    - echo "RUN echo export PS1=\'[\\\u \\\W]\$ \' >> /home/delphi/.bashrc" >> Dockerfile
    - /kaniko/executor
      --context "${CI_PROJECT_DIR}"

--- a/CI/al9_aarch64.yml
+++ b/CI/al9_aarch64.yml
@@ -280,8 +280,9 @@ container_al9_aarch64:
  script:
    - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
    - echo "creating container ..."; echo "FROM $IMAGEAL9ARM" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
+    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
    - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/aarch64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
-    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_aarch64_os; dnf -y update" >> Dockerfile
+    - echo "RUN dnf-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_aarch64_os; dnf -y update" >> Dockerfile
    - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile
    - echo "RUN groupadd delphi" >> Dockerfile; echo 'RUN useradd -m -g delphi delphi' >> Dockerfile; echo "WORKDIR /home/delphi" >> Dockerfile
    - echo "RUN dnf clean all; dnf -y install sudo libGLEW glew-devel procps-ng mesa-dri-drivers tigervnc tigervnc-server xrootd-client" >> Dockerfile; echo "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile

--- a/CI/al9_aarch64_xrd.yml
+++ b/CI/al9_aarch64_xrd.yml
@@ -254,13 +254,13 @@ binaries_al9_aarch64_xrd:
  script:
    - echo "Packaging binaries..."
    - mv d/releases/almalinux-aarch64-9 .
-    - mv almalinux-aarch64-9 almalinux-aarch64_xrd-9
-    - (cd almalinux-aarch64_xrd-9; rm -rf perl ; ln -s ../../perl)
-    - touch almalinux-aarch64_xrd-9/.cvmfscatalog
+    - mv almalinux-aarch64-9 almalinux-aarch64-9_xrd
+    - (cd almalinux-aarch64-9_xrd; rm -rf perl ; ln -s ../../perl)
+    - touch almalinux-aarch64-9_xrd/.cvmfscatalog
  artifacts:
-    name:  almalinux-aarch64_xrd-9
+    name:  almalinux-aarch64-9_xrd
    paths:
-      - almalinux-aarch64_xrd-9
+      - almalinux-aarch64-9_xrd

 container_al9_aarch64_xrd:
  image:
@@ -281,12 +281,13 @@ container_al9_aarch64_xrd:
  script:
    - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
    - echo "creating container ..."; echo "FROM $IMAGEAL9ARM" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
+    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
    - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/aarch64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_aarch64_os; dnf -y update" >> Dockerfile
    - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile
    - echo "RUN groupadd delphi" >> Dockerfile; echo 'RUN useradd -m -g delphi delphi' >> Dockerfile; echo "WORKDIR /home/delphi" >> Dockerfile
    - echo "RUN dnf clean all; dnf -y install sudo libGLEW glew-devel procps-ng mesa-dri-drivers tigervnc tigervnc-server xrootd-client" >> Dockerfile; echo "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile
-    - echo "RUN chmod 400 /etc/shadow; cd /delphi; ln -s almalinux-aarch64_xrd-9 almalinux-aarch64-9" >> Dockerfile
+    - echo "RUN chmod 400 /etc/shadow; cd /delphi; ln -s almalinux-aarch64-9_xrd almalinux-aarch64-9" >> Dockerfile
    - echo "RUN cd /home/delphi; git clone https://gitlab.cern.ch/delphi/examples.git; mkdir graexe graexe/data graexe/run graexe/hcopy; chown -R delphi.delphi examples graexe; " >> Dockerfile
    - echo "RUN echo export PS1=\'[\\\u \\\W]\$ \' >> /home/delphi/.bashrc" >> Dockerfile
    - /kaniko/executor

--- a/CI/fed41_64_xrd.yml
+++ b/CI/fed41_64_xrd.yml
+---
+#########################################################################
+#########################################################################
+cernlib_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: cernlib
+  needs:
+    - common_al9_64
+  when: manual
+  before_script:
+    - umask 022
+    - dnf -y install openssl-devel cmake make
+    - dnf -y install file xrootd-client-libs xrootd-client-devel
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make clean setup cernlib
+  artifacts:
+    paths:
+      - d
+
+dstana_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: dstana
+  needs:
+    - cernlib_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make dstana
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+ddb_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: ddb
+  needs:
+    - cernlib_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make ddb
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+lep1simana_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: lep1simana
+  needs:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make v95d v94c v93d v92e v91f v90e
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+lep2simana_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: lep2simana
+  needs:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make va0u va0e v99e v98e v97g v96g
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+delgra_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: delgra
+  needs:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - dnf -y install libGLEW glew-devel
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make openphigs delgra
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+des_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: des
+  needs:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+  dependencies:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - . /etc/kinit.sh ; klist
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make des
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+idea_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: idea
+  needs:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+  before_script:
+    - umask 022
+    - dnf -y install gcc-c++
+    - dnf -y install file xrootd-client-libs xrootd-client-devel make
+  dependencies:
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
+    - path=`pwd`; export DELPHI_INSTALL_DIR=$path/d; export CERNLIB_XROOTD=ON; make idea
+  allow_failure: true
+  artifacts:
+    paths:
+      - d
+    expire_in: '1 day'
+
+tests_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: tests
+  before_script:
+    - umask 022
+    - dnf -y install gcc-c++ file libGLEW glew-devel gfortran tcsh make
+    - dnf -y install file xrootd-client-libs xrootd-client-devel
+  needs:
+    - common_al9_64
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+    - des_fed41_64_xrd
+    - delgra_fed41_64_xrd
+    - idea_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  dependencies:
+    - common_al9_64
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+    - des_fed41_64_xrd
+    - delgra_fed41_64_xrd
+    - idea_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  script:
+    - echo "[http]" > ~/.gitconfig; echo "    emptyAuth = true" >> ~/.gitconfig; echo >>  ~/.gitconfig
+    - echo "${CI_PASSWD}" | kinit ${CI_USER}@CERN.CH
+    - path=`pwd`; export DELPHI_DATA_DIR=${path}/test-samples; export DELPHI_INSTALL_DIR=${path}/d; export CERNLIB_XROOTD=ON; make test
+  # only needed for image creation !
+  artifacts:
+    name: delphi
+    paths:
+        - d/*
+    expire_in: '1 day'
+
+binaries_fed41_64_xrd:
+  image: $IMAGEFED41
+  stage: binaries
+  needs:
+    - common_al9_64
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+    - des_fed41_64_xrd
+    - delgra_fed41_64_xrd
+    - idea_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  dependencies:
+    - common_al9_64
+    - cernlib_fed41_64_xrd
+    - dstana_fed41_64_xrd
+    - lep1simana_fed41_64_xrd
+    - lep2simana_fed41_64_xrd
+    - des_fed41_64_xrd
+    - delgra_fed41_64_xrd
+    - idea_fed41_64_xrd
+    - ddb_fed41_64_xrd
+  before_script:
+    - umask 022
+  script:
+    - echo "Packaging binaries..."
+    - mv d/releases/fedora-x86_64-41 .
+    - mv fedora-x86_64-41 fedora-x86_64-41_xrd
+    - (cd fedora-x86_64-41_xrd; rm -rf perl ; ln -s ../../perl)
+    - touch fedora-x86_64-41_xrd/.cvmfscatalog
+  artifacts:
+    name: fedora-x86_64-41_xrd
+    paths:
+      - fedora-x86_64-41_xrd
+
+container_fed41_64_xrd:
+  image:
+    name: gcr.io/kaniko-project/executor:v1.14.0-debug
+    entrypoint: [""]
+  stage: container
+  when: manual
+  needs:
+    - common_al9_64
+    - tests_fed41_64_xrd
+  dependencies:
+    - common_al9_64
+    - tests_fed41_64_xrd
+  before_script:
+    - umask 022
+  script:
+    - echo "export DELPHI_INSTALL_DIR=/delphi; . /delphi/setup.sh" > delphi.sh; echo "setenv DELPHI_INSTALL_DIR /delphi; source /delphi/setup.csh" > delphi.csh;
+    - echo "creating container ..."; echo "FROM $IMAGEFED41" > Dockerfile; echo "RUN mkdir /delphi" >> Dockerfile
+    - echo "RUN dnf config-manager --set-enabled crb" >> Dockerfile
+    - echo "RUN rpm --import http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2 http://linuxsoft.cern.ch/internal/repos/RPM-GPG-KEY-kojiv2/RPM-GPG-KEY-cern;yum-config-manager -y --add-repo http://linuxsoft.cern.ch/internal/repos/eos9-stable/x86_64/os; dnf -y update; dnf -y install eos-fusex" >> Dockerfile
+    - echo "RUN yum-config-manager -y --set-disabled linuxsoft.cern.ch_internal_repos_eos9-stable_x86_64_os; dnf -y update" >> Dockerfile
+    - echo "ADD d/ /delphi" >> Dockerfile; echo "COPY delphi.sh /etc/profile.d/delphi.sh" >> Dockerfile; echo "COPY delphi.csh /etc/profile.d/delphi.csh" >> Dockerfile
+    - echo "RUN groupadd delphi" >> Dockerfile; echo 'RUN useradd -m -g delphi delphi' >> Dockerfile; echo "WORKDIR /home/delphi" >> Dockerfile
+    - echo "RUN dnf clean all; dnf -y install sudo libGLEW glew-devel procps-ng mesa-dri-drivers tigervnc tigervnc-server xrootd-client" >> Dockerfile; echo "RUN echo '%delphi ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers" >> Dockerfile
+    - echo "RUN cd /home/delphi; git clone https://gitlab.cern.ch/delphi/examples.git; mkdir graexe graexe/data graexe/run graexe/hcopy; chown -R delphi.delphi examples graexe; " >> Dockerfile
+    - echo "RUN chmod 400 /etc/shadow; cd /delphi; ln -s fedora-x86_64-41_xrd fedora-x86_64-41" >> Dockerfile
+    - echo "RUN echo export PS1=\'[\\\u \\\W]\$ \' >> /home/delphi/.bashrc" >> Dockerfile
+    - /kaniko/executor
+      --context "${CI_PROJECT_DIR}"
+      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+      --destination "${CI_REGISTRY_IMAGE}/delphi/fed41_64_xrd:latest"
--- a/env/delphi.csh.template
+++ b/env/delphi.csh.template
@@ -9,10 +9,22 @@ endif
 if ( -e $DELPHI_INSTALL_DIR/env/ostag) then
    setenv OS_TAG `$DELPHI_INSTALL_DIR/env/ostag`
    setenv OS_ARCH `$DELPHI_INSTALL_DIR/env/osarch`
-    setenv GROUP_DIR ${DELPHI_INSTALL_DIR}/releases/${OS_TAG}
 else if ( -e env/ostag ) then
    setenv OS_TAG `env/ostag`
    setenv OS_ARCH `env/osarch`
+endif
+
+# check for Xrd
+if ( "x$CERNLIB_XROOTD" == "xON" ) then
+    setenv DELPHI_XRD "_xrd"
+else
+    setenv DELPHI_XRD ""
+endif
+
+# setup group dir
+if ( -d ${DELPHI_INSTALL_DIR}/releases/${OS_TAG}${DELPHI_XRD}) then
+    setenv GROUP_DIR ${DELPHI_INSTALL_DIR}/releases/${OS_TAG}${DELPHI_XRD}
+else
    setenv GROUP_DIR ${DELPHI_INSTALL_DIR}/releases/${OS_TAG}
 endif

@@ -150,7 +162,7 @@ endif
 if ( -d ${GROUP_DIR}/castor ) then
  setenv LD_LIBRARY_PATH ${GROUP_DIR}/castor:${LD_LIBRARY_PATH}
 endif
-    
+
 # check for AFS
 set x = `echo $USER| cut -b1`
 set AFS_HOME = "/afs/cern.ch/user/${x}/${USER}"

--- a/env/delphi.sh.template
+++ b/env/delphi.sh.template
@@ -19,19 +19,30 @@ if [ -e $DELPHI_INSTALL_DIR/env/mount_eos.sh ]; then
    $DELPHI_INSTALL_DIR/env/mount_eos.sh
 fi

-#
 if [ -e $DELPHI_INSTALL_DIR/env/osarch ]; then
    export OS_ARCH=`$DELPHI_INSTALL_DIR/env/osarch`
    export OS_TAG=`$DELPHI_INSTALL_DIR/env/ostag`
-    export GROUP_DIR=${DELPHI_INSTALL_DIR}/releases/${OS_TAG}
 else
    if [ -e env/osarch ]; then
 	export OS_ARCH=`env/osarch`
 	export OS_TAG=`env/ostag`
-	export GROUP_DIR=${DELPHI_INSTALL_DIR}/releases/${OS_TAG}
    fi
 fi

+#
+# check for Xrd
+if [ "x$CERNLIB_XROOTD" == "xON" ]; then
+    export DELPHI_XRD="_xrd"
+else
+    export DELPHI_XRD=""
+fi
+
+if [ -d ${DELPHI_INSTALL_DIR}/releases/${OS_TAG}${DELPHI_XRD} ]; then
+    export GROUP_DIR=${DELPHI_INSTALL_DIR}/releases/${OS_TAG}${DELPHI_XRD}
+else
+    export GROUP_DIR=${DELPHI_INSTALL_DIR}/releases/${OS_TAG}
+fi
+
 if test "x${CERN}" = "x" ; then
   export CERN=${GROUP_DIR}/cern
 else
@@ -117,7 +128,7 @@ export DELPHI_CRA=${DELPHI_PAM}
 export DELPHI_PATH=${DELPHI_BIN}

 # ddb location
-export DELPHI_DDB=/eos/opendata/delphi/condition-data    
+export DELPHI_DDB=/eos/opendata/delphi/condition-data
 if test -e /eos/experiment/delphi/castor2015/ddb ; then
    export DELPHI_DDB=/eos/experiment/delphi/castor2015/ddb
 fi

--- a/env/ostag
+++ b/env/ostag
@@ -2,13 +2,23 @@

 OS=`uname -s`
 OS_ARCH=`uname -m`
+
+# check for Apple/Darwin
 if [ $OS = 'Darwin' ]; then
    export OS_ID=$OS
    export OS_RELEASE=`sw_vers --productVersion| cut -d\. -f1`
 else
-    export OS_ID=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
-    export OS_RELEASE=$(grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"'| cut -d\. -f1)
+    # Linux case
+    if  [ $OS = 'Linux' ]; then
+	export OS_ID=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
+	export OS_RELEASE=$(grep -oP '(?<=^VERSION_ID=).+' /etc/os-release | tr -d '"'| cut -d\. -f1)
+	# anything we do not know
+    else
+	echo "Unknown operating system $OS. Currently supported are Linux and Darwin only."
+	exit 1
+    fi
 fi
+# test architecture
 if [ "x$OS_ARCH" == "xx86_64" -a "x$LEGACY" != "x" ]; then OS_ARCH='i386'; fi
 if [ "x$OS_ARCH" == "xaarch64" ]; then
    file /bin/bash | grep 32-bit > /dev/null 2>&1

--- a/make_delgra
+++ b/make_delgra
@@ -12,7 +12,7 @@ if [ ! -e $GRA_PLACE/gra_instal.sh ] ; then
    cd $GRA_PLACE
    git clone https://:@gitlab.cern.ch:8443/delphi/delgra.git
    cd delgra
-    git checkout xrootd
+    git checkout master
    rm -rf CI .gitlab-ci .git
    cd ..
    mv delgra/* .