correct naming conventions

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:
@@ -272,7 +272,7 @@ container_al9_64_xrd:
     - 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}"

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:
@@ -287,7 +287,7 @@ container_al9_aarch64_xrd:
     - 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

CI/fed41_64_xrd.yml

@@ -239,14 +239,14 @@ binaries_fed41_64_xrd:
     - umask 022
   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 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: almalinux-x86_64_xrd-9
+    name: fedora-x86_64-41_xrd
     paths:
-      - almalinux-x86_64_xrd-9
+      - fedora-x86_64-41_xrd
 
 container_fed41_64_xrd:
   image:
@@ -272,7 +272,7 @@ container_fed41_64_xrd:
     - 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 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}"