From e63cf821e2d3bf2197d780b61e0cf43ec6c53e2c Mon Sep 17 00:00:00 2001
From: Davide Gerbaudo <davide.gerbaudo@cern.ch>
Date: Sat, 29 Apr 2017 20:08:32 +0000
Subject: [PATCH] Merge branch 'tdaq_cvmfs' into '21.1'
Use tdaq software stack from cvmfs (ATLINFR-1689)
See merge request !1290
Former-commit-id: 5c578ad1aa26a4cbcce7744cc354c75356018526
---
Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh b/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
index 7eb581f6e258..297fa9e6332b 100644
--- a/Build/AtlasBuildScripts/TDAQ_RELEASE_BASE.sh
+++ b/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}"
--
GitLab