Skip to content

Commit

Permalink
chore: Update CVMFS/LCG setup scripts (#1314)
Browse files Browse the repository at this point in the history
Removes LCG97 and 98 setup scripts in favor of 100 & 101.
Also updates the scripts to run on CentOS Stream 8
  • Loading branch information
paulgessinger authored Jul 15, 2022
1 parent 55b8ce6 commit 9f03bc9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CI/setup_cvmfs_lcg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ else
fi

dir="$( cd "$( dirname "${this_script}" )" && pwd )"
source $dir/setup_cvmfs_lcg97.sh
source $dir/setup_cvmfs_lcg101.sh
8 changes: 5 additions & 3 deletions CI/setup_cvmfs_lcg98.sh → CI/setup_cvmfs_lcg100.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# setup appropriate LCG 98 release via cvmfs
# setup appropriate LCG 100 release via cvmfs

if test -e /etc/centos-release && grep 'CentOS Linux release 7' /etc/centos-release; then
lcg_os=centos7
elif test -e /etc/centos-release && grep 'CentOS Stream release 8' /etc/centos-release; then
lcg_os=centos8
else
echo "Unsupported system" 1>&2
return
fi

lcg_release=LCG_98python3
lcg_release=LCG_100
lcg_compiler=gcc10-opt
lcg_platform=x86_64-${lcg_os}-${lcg_compiler}
lcg_view=/cvmfs/sft.cern.ch/lcg/views/${lcg_release}/${lcg_platform}

source ${lcg_view}/setup.sh
# extra variables required to build acts
export DD4hep_DIR=${lcg_view}
export DD4hep_DIR=${lcg_view}
10 changes: 6 additions & 4 deletions CI/setup_cvmfs_lcg97.sh → CI/setup_cvmfs_lcg101.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# setup appropriate LCG 97 release via cvmfs
# setup appropriate LCG 101 release via cvmfs

if test -e /etc/centos-release && grep 'CentOS Linux release 7' /etc/centos-release; then
lcg_os=centos7
elif test -e /etc/centos-release && grep 'CentOS Stream release 8' /etc/centos-release; then
lcg_os=centos8
else
echo "Unsupported system" 1>&2
return
fi

lcg_release=LCG_97apython3
lcg_compiler=gcc9-opt
lcg_release=LCG_101
lcg_compiler=gcc11-opt
lcg_platform=x86_64-${lcg_os}-${lcg_compiler}
lcg_view=/cvmfs/sft.cern.ch/lcg/views/${lcg_release}/${lcg_platform}

source ${lcg_view}/setup.sh
# extra variables required to build acts
export DD4hep_DIR=${lcg_view}
export DD4hep_DIR=${lcg_view}

0 comments on commit 9f03bc9

Please sign in to comment.