From f793ece95d57f3b8a604dbcfe8aa07cf128552c5 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 21 May 2024 17:14:22 +0200
Subject: [PATCH] Merge branch '105_freeNxcals' into 'LCG_105-patches'
SPI-2573: add priority package for all create_lcg_view
See merge request sft/lcgcmake!2266
(cherry picked from commit e9991422f0f5657a260c71a3dd72b9f4b056da11)
629c089a SPI-2573: add priority package for all create_lcg_view
---
jenkins/cvmfs_install.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jenkins/cvmfs_install.sh b/jenkins/cvmfs_install.sh
index eacbcb4c59..f62b3f4843 100755
--- a/jenkins/cvmfs_install.sh
+++ b/jenkins/cvmfs_install.sh
@@ -111,7 +111,7 @@ elif [[ "${BUILDMODE}" == "release" ]]; then
cd /cvmfs/sft.cern.ch/lcg/releases/LCG_${LCG_VERSION}
$WORKSPACE/lcgcmake/jenkins/extract_LCG_summary.py . $PLATFORM ${LCG_VERSION} RELEASE
if [ ${VIEWS_CREATION} == "true" ]; then
- test "\$abort" == "1" && $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft.cern.ch/lcg/releases -p $PLATFORM -r LCG_${LCG_VERSION} -d -B /cvmfs/sft.cern.ch/lcg/views/LCG_${LCG_VERSION}/$PLATFORM
+ test "\$abort" == "1" && $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft.cern.ch/lcg/releases -p $PLATFORM -r LCG_${LCG_VERSION} -d -B /cvmfs/sft.cern.ch/lcg/views/LCG_${LCG_VERSION}/$PLATFORM --conflict pytimber
fi
if [ "\$?" == "0" -o ${VIEWS_CREATION} == "false" ]; then
@@ -143,7 +143,7 @@ elif [[ "${BUILDMODE}" == "limited" ]]; then
fi
if [ ${VIEWS_CREATION} == "true" ]; then
- test "\$abort" == "1" && $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft.cern.ch/lcg/releases/LCG_${LCG_VERSION} -p $PLATFORM -d -B /cvmfs/sft.cern.ch/lcg/views/LCG_${LCG_VERSION}/$PLATFORM
+ test "\$abort" == "1" && $WORKSPACE/lcgcmake/cmake/scripts/create_lcg_view.py -l /cvmfs/sft.cern.ch/lcg/releases/LCG_${LCG_VERSION} -p $PLATFORM -d -B /cvmfs/sft.cern.ch/lcg/views/LCG_${LCG_VERSION}/$PLATFORM --conflict pytimber
fi
if [ "\$?" == "0" -o ${VIEWS_CREATION} == "false" ]; then
--
GitLab