Fix Spack area names

Author: eflumerf

.github/workflows/artdaq-spack-selfhosted.yaml

@@ -22,17 +22,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'alma9', 'alma10' ]
+        os: [ 'al9', 'al10' ]
         spackVer: [ 'v0.28', 'v1.1' ]
     runs-on: [self-hosted, "${{ matrix.os }}"]
     steps:
       - name: Test CVMFS
         id: cvmfsdirs
         run: |
           ls -l /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}
-          art=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/art-suite-*|tail -1|sed 's|.*/||g'`
-          artdaq=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/artdaq-*|tail -1|sed 's|.*/||g'`
-          ots=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/ots-*|tail -1|sed 's|.*/||g'`
+          art=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/art-suite-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
+          artdaq=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/artdaq-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
+          ots=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/ots-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
           echo "${art} ${artdaq} ${ots}"
           echo "art=${art}" >> $GITHUB_OUTPUT
           echo "artdaq=${artdaq}" >> $GITHUB_OUTPUT

.github/workflows/otsdaq-spack-selfhosted.yaml

@@ -22,17 +22,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'alma9', 'alma10' ]
+        os: [ 'al9', 'al10' ]
         spackVer: [ 'v0.28', 'v1.1' ]
     runs-on: [self-hosted, "${{ matrix.os }}"]
     steps:
       - name: Test CVMFS
         id: cvmfsdirs
         run: |
           ls -l /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}
-          art=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/art-suite-*|tail -1|sed 's|.*/||g'`
-          artdaq=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/artdaq-*|tail -1|sed 's|.*/||g'`
-          ots=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/ots-*|tail -1|sed 's|.*/||g'`
+          art=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/art-suite-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
+          artdaq=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/artdaq-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
+          ots=`ls -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_${{matrix.spackVer}}/ots-*-${{matrix.os}}|tail -1|sed 's|.*/||g'`
           echo "${art} ${artdaq} ${ots}"
           echo "art=${art}" >> $GITHUB_OUTPUT
           echo "artdaq=${artdaq}" >> $GITHUB_OUTPUT

dockerfiles/artdaq-spack.dockerfile

@@ -4,8 +4,8 @@ ARG BASE_IMAGE=eflumerf/alma9-spack:latest
 
 FROM ${BASE_IMAGE} AS intermediate
 
-ARG ARTDAQ_AREA=artdaq-v4_05_00
-ARG ART_AREA=art-suite-s132.1
+ARG ARTDAQ_AREA=artdaq-v4_05_00-al9
+ARG ART_AREA=art-suite-s133-al9
 ARG SPACK_VERSION=v0.28
 ARG SCRIPT_NAME=quick-spack-start_${SPACK_VERSION}.sh
 

dockerfiles/otsdaq-spack.dockerfile

@@ -4,9 +4,9 @@ ARG BASE_IMAGE=eflumerf/alma9-spack:latest
 
 FROM $BASE_IMAGE AS intermediate
 
-ARG OTS_AREA=ots-v3_05_00
-ARG ARTDAQ_AREA=artdaq-v4_05_00
-ARG ART_AREA=art-suite-s132.1
+ARG OTS_AREA=ots-v3_05_00-al9
+ARG ARTDAQ_AREA=artdaq-v4_05_00-al9
+ARG ART_AREA=art-suite-s133-al9
 ARG SPACK_VERSION=v0.28
 ARG SCRIPT_NAME=ots-quick-spack-start_${SPACK_VERSION}.sh