diff --git a/jenkins/docker.sh b/jenkins/docker.sh index a395b681efb56e74b92e21ebe4e1ef25f2dcec5f..be65616b061ab904716ea04cca661b973f3969fd 100755 --- a/jenkins/docker.sh +++ b/jenkins/docker.sh @@ -45,6 +45,7 @@ cmd="${main_dir}/jenkins/lb-docker-run \ $propagate_private \ --network host \ --no-interactive \ + --no-lbenv \ --update" for mockCopy in python scripts jenkins setup.sh ; do diff --git a/jenkins/utils.d/build_slot.sh b/jenkins/utils.d/build_slot.sh index d9089ad6f6baa9c4597b86651ca3adb2ec2c0a84..a8baebb62b70747b6db55551be4d754a84b4b255 100644 --- a/jenkins/utils.d/build_slot.sh +++ b/jenkins/utils.d/build_slot.sh @@ -143,12 +143,6 @@ build_slot flavour slot slot_build_id platform time lbn-rpm ${loglevel_opt} --build-id "${slot}.${slot_build_id}" --artifacts-dir "${directory}" ${config_file} --platform "${platform}" createrepo ${directory}/rpms if [[ "$platform" != *-slc5-* ]] ; then - # remove old copies (we want always a fresh install) - rm -rf ~/.local/{bin,lib} ~/.cache/pip - # get latest pip and lbinstall - curl -O https://bootstrap.pypa.io/get-pip.py - python get-pip.py --user - ~/.local/bin/pip install --extra-index-url https://lhcb-pypi.web.cern.ch/lhcb-pypi/simple --trusted-host lhcb-pypi.web.cern.ch --user lbinstall -U lbn-rpm-validator -d --build-folder=${directory}/rpms --repo-url=file:${directory}/rpms ${platform} fi fi diff --git a/jenkins/utils.d/set_common.sh b/jenkins/utils.d/set_common.sh index 5ad4385897e9e5186deed50edeccdb0ca6a2d7ab..2ed1db07fd020a3e4a96ef1d85398237005da468 100644 --- a/jenkins/utils.d/set_common.sh +++ b/jenkins/utils.d/set_common.sh @@ -117,46 +117,16 @@ set_common [--build] [--test]" echo EOS destination: $EOS_ARTIFACTS_DIR echo =================================================================== - LbScriptsVersion=dev - LbLoginPath=/cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/${LbScriptsVersion}/InstallArea/scripts/LbLogin.sh - - # FIXME: workaround for LBCORE-769 - if ( echo $platform | grep -q slc5 ) ; then - export PATH=/cvmfs/lhcb.cern.ch/lib/lcg/external/Python/2.7.3/x86_64-slc5-gcc46-opt/bin:$PATH - LbLoginPath="$LbLoginPath --cmakevers=3.3.2" - fi + LbEnvPath=/cvmfs/lhcb.cern.ch/lib/LbEnv-dev.sh if [ "${special_config}" == "true" ] ; then export LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | tr : \\n | grep -v /gcc/ | tr \\n :) - # FIXME: this is usually set by the "group login" script, but it is not - # called on lxbuild (it is needed to get the right ICC environment) - export GROUP_DIR=/afs/cern.ch/group/z5 - export LOGIN_POST_SCRIPT=${GROUP_DIR}/post/login - export CMTEXTRATAGS=host-$(echo $platform | cut -d: -f2 | cut -d- -f2) - . $LbLoginPath - export CMTCONFIG=${platform} - # COMPILER_PATH (may be set by LbLogin) create troubles - unset COMPILER_PATH - # FIXME: variable not set in CVMFS LbLogin.sh (but should not be used by builds) - export LHCBTAR=/afs/cern.ch/lhcb/distribution - - # FIXME: temporary workaround for a working gdb in CentOS7 (see LBCORE-1261) - if ( echo $platform | grep -q centos7 ) ; then - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/afs/cern.ch/user/m/marcocle/public/centos7_lib - fi - - # FIXME: make sure that if we need to call something from /cvmfs/sft.cern.ch/lcg/contrib/bintuils/2.28/xyz/bin - # we get the libraries they need - export PATH=/afs/cern.ch/work/m/marcocle/workspace/LbScripts/LbUtils/scripts:$PATH - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/cvmfs/sft.cern.ch/lcg/contrib/bintuils/2.28/${LCG_hostos}/lib + . $LbEnvPath -c ${platform} # add Intel VTune to the search path - export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/vtune_amplifier_xe - - # special hack to get a dev version of the CMake configuration files - export CMAKE_PREFIX_PATH=/afs/cern.ch/work/m/marcocle/workspace/LbScripts/LbUtils/cmake:${CMAKE_PREFIX_PATH} + export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2019/vtune_amplifier else - . $LbLoginPath + . $LbEnvPath fi if [ "${USER}" != "lblocal" ] ; then diff --git a/python/LbRPMTools/LHCbRPMSpecBuilder.py b/python/LbRPMTools/LHCbRPMSpecBuilder.py index 083f86297cd88007d805c602e50aace379946bdb..05bdd11e8849a1ecaeaf70d180b4de208cabb691 100644 --- a/python/LbRPMTools/LHCbRPMSpecBuilder.py +++ b/python/LbRPMTools/LHCbRPMSpecBuilder.py @@ -1041,7 +1041,7 @@ echo "Creating link in update.d" mkdir -p -v $PREFIX/etc/update.d ln -s $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/Update.py $PREFIX/etc/update.d/%{package}_Update.py echo "Running Update script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null echo "Now using python:" which python echo "PYTHONPATH: $PYTHONPATH" @@ -1052,7 +1052,7 @@ fi if [ -f $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py ]; then echo "Running PostInstall script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null python $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py fi @@ -1219,7 +1219,7 @@ echo "Creating link in update.d" mkdir -p -v $PREFIX/etc/update.d ln -s $PREFIX/lhcb/%{projectUp}/%{projectUp}_%{lbversion}/%{project}Sys/cmt/Update.py $PREFIX/etc/update.d/%{package}_Update.py echo "Running Update script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null echo "Now using python:" which python echo "PYTHONPATH: $PYTHONPATH" diff --git a/testdata/rpm/PARAM_TMVAWeights.spec b/testdata/rpm/PARAM_TMVAWeights.spec index efe08fc0ff28e6b27726778614406492e6ea442e..01d856589c17c11e1b2a30ede917e8b11ed3fc63 100644 --- a/testdata/rpm/PARAM_TMVAWeights.spec +++ b/testdata/rpm/PARAM_TMVAWeights.spec @@ -71,7 +71,7 @@ echo "Creating link in update.d" mkdir -p -v $PREFIX/etc/update.d ln -s $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/Update.py $PREFIX/etc/update.d/%{package}_Update.py echo "Running Update script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null echo "Now using python:" which python echo "PYTHONPATH: $PYTHONPATH" @@ -82,7 +82,7 @@ fi if [ -f $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py ]; then echo "Running PostInstall script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null python $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py fi diff --git a/testdata/rpm/PARAM_TMVAWeights_rel5.spec b/testdata/rpm/PARAM_TMVAWeights_rel5.spec index eef276eb1bdcde195b8b067512d5cfc13c026bff..5d1ed12f4bdbd56da9007a0c70b4b664832e0a70 100644 --- a/testdata/rpm/PARAM_TMVAWeights_rel5.spec +++ b/testdata/rpm/PARAM_TMVAWeights_rel5.spec @@ -71,7 +71,7 @@ echo "Creating link in update.d" mkdir -p -v $PREFIX/etc/update.d ln -s $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/Update.py $PREFIX/etc/update.d/%{package}_Update.py echo "Running Update script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null echo "Now using python:" which python echo "PYTHONPATH: $PYTHONPATH" @@ -82,7 +82,7 @@ fi if [ -f $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py ]; then echo "Running PostInstall script" -. $PREFIX/LbLogin.sh --silent --mysiteroot=$PREFIX +. $PREFIX/LbEnv.sh --siteroot $PREFIX 2>/dev/null python $PREFIX/lhcb/%{versiondir}/%{lbversion}/cmt/PostInstall.py fi