Merge branch 'cherry-pick-6a10264f-3' into '21.0'

Use tdaq software stack from cvmfs (ATLINFR-1689)

See merge request !1362

Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh

@@ -10,10 +10,13 @@
 
 if [ -z "${TDAQ_RELEASE_BASE}" ]; then
 
-    if [ -d /afs/cern.ch/atlas/project/tdaq/prod ]; then
+    if [ -d /cvmfs/atlas.cern.ch/repo/sw/tdaq ]; then
+        export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/tdaq
+    elif [ -d /afs/cern.ch/atlas/project/tdaq/prod ]; then
         export TDAQ_RELEASE_BASE=/afs/cern.ch/atlas/project/tdaq/prod
-    elif [ -d /cvmfs/atlas.cern.ch/repo/sw/software/21.0 ]; then
-        export TDAQ_RELEASE_BASE=/cvmfs/atlas.cern.ch/repo/sw/software/21.0
+    else
+        echo "Error: Cannot find TDAQ software installation"
+        return 1
     fi
     echo "Set TDAQ_RELEASE_BASE = ${TDAQ_RELEASE_BASE}"
 

Projects/Athena/CMakeLists.txt

@@ -11,16 +11,16 @@ set( ATHENA_PROJECT_VERSION ${_version}
 unset( _version )
 
 # Set the versions of the TDAQ externals to pick up for the build:
-set( TDAQ-COMMON_VERSION "02-01-00" )
+set( TDAQ-COMMON_VERSION "02-02-00" )
 set( TDAQ-COMMON_ROOT
    "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" )
 
-set( DQM-COMMON_VERSION "01-01-00" )
+set( DQM-COMMON_VERSION "01-02-00" )
 set( DQM-COMMON_ROOT
    "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" )
 
 set( TDAQ_PROJECT_NAME "tdaq")
-set( TDAQ_VERSION "07-00-00" )
+set( TDAQ_VERSION "07-01-00" )
 set( TDAQ_ROOT "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" )
 
 # Find the ATLAS CMake code: