From f66acfdecae671b7ad1a6b000cd124671d7b9e94 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Mon, 15 Jul 2019 12:54:07 +0200
Subject: [PATCH] Make LCG release a variable
---
.dd4hep-ci.d/init_x86_64.sh | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index 1657c891c..1f21c11e3 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -43,10 +43,14 @@ fi
# General variables
-LCGREPO=/cvmfs/sft.cern.ch/lcg/releases/LCG_96
+if [ -z ${LCG_RELEASE} ]; then
+ LCG_RELEASE="LCG_96"
+fi
+
+LCGREPO=/cvmfs/sft.cern.ch/lcg/releases/${LCG_RELEASE}
BUILD_FLAVOUR=x86_64-${OS}-${COMPILER_VERSION}-${BUILD_TYPE}
-export LD_LIBRARY_PATH=/cvmfs/sft.cern.ch/lcg/views/LCG_96/${BUILD_FLAVOUR}/lib64:/cvmfs/sft.cern.ch/lcg/views/LCG_96/${BUILD_FLAVOUR}/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/lib64:/cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${BUILD_FLAVOUR}/lib:$LD_LIBRARY_PATH
#--------------------------------------------------------------------------------
# Compiler
@@ -69,8 +73,11 @@ export PATH=${CMAKE_HOME}/bin:$PATH
#--------------------------------------------------------------------------------
# Python
#--------------------------------------------------------------------------------
-
-export PYTHONDIR=${LCGREPO}/Python/2.7.16/${BUILD_FLAVOUR}
+if [[ $LCG_RELEASE =~ "python3" ]]; then
+ export PYTHONDIR=${LCGREPO}/Python/3.6.5/${BUILD_FLAVOUR}
+else
+ export PYTHONDIR=${LCGREPO}/Python/2.7.16/${BUILD_FLAVOUR}
+fi
export PATH=${PYTHONDIR}/bin:$PATH
export LD_LIBRARY_PATH=${PYTHONDIR}/lib:${LD_LIBRARY_PATH}
--
GitLab