From a70392d7a0c929a41270f53cb4b558b3314735e6 Mon Sep 17 00:00:00 2001
From: FASER Reco <faserrec@lxplus909.cern.ch>
Date: Mon, 27 Jan 2025 02:05:12 +0100
Subject: [PATCH] Maybe CI now works again?
---
.gitlab-ci.yml | 19 ++++---------------
PhysicsAnalysis/NtupleDumper/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 880c052b..4ecd6a28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,19 +22,11 @@ build_image:
tags:
- k8s-cvmfs
script:
- #- yum -y --disablerepo=epel install redhat-lsb redhat-lsb-core man uuid-devel libuuid libuuid-devel mesa-libGL-devel libXpm-devel
- # - yum -y install man which zlib-devel lz4-devel cmake make gcc gcc-c++ uuid-devel libuuid-devel expat-devel #mesa-libGL-devel libXpm-devel
- # - yum -y install redhat-lsb # This doesn't exist in the main release!
- # --disablerepo=epel redhat-lsb redhat-lsb-core
- mkdir build
- - ls
# See if we can run this as the payload to a container
- - set +e && export ALRB_CONT_RUNPAYLOAD="cd build; ls ..; asetup --input=../asetup.faser Athena,24.0.41; cmake ..; make -j 3" && set -e
+ - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; cd build; cmake ..; make -j 3" && set -e
- echo $ALRB_CONT_RUNPAYLOAD
- set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
- #- set +e && asetup --input=../../calypso/asetup.faser Athena,24.0.41; set -e
- #- cmake ../../calypso
- #- make -j 3
artifacts:
paths:
- build/
@@ -46,12 +38,9 @@ test_unittest:
tags:
- k8s-cvmfs
script:
- - yum -y --disablerepo=epel install man which git make cmake3 gcc-c++ gcc binutils libX11-devel libXpm-devel libXft-devel libXext-devel python openssl-devel
- - cd build
- - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
- - set +e && asetup --input=../../calypso/asetup.faser Athena,24.0.41; set -e
- - set +e && source `find . -name 'setup.sh'`; set -e
- - ctest -j3
+ - set +e && export ALRB_CONT_RUNPAYLOAD="asetup --input=asetup.faser Athena,24.0.41; cd build; source `find . -name 'setup.sh'`; ctest -j3" && set -e
+ - echo $ALRB_CONT_RUNPAYLOAD
+ - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh -c alma9 && set -e
dependencies:
- build_image
artifacts:
diff --git a/PhysicsAnalysis/NtupleDumper/CMakeLists.txt b/PhysicsAnalysis/NtupleDumper/CMakeLists.txt
index 92e36c09..875c81e6 100644
--- a/PhysicsAnalysis/NtupleDumper/CMakeLists.txt
+++ b/PhysicsAnalysis/NtupleDumper/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_add_component(
src/NtupleDumperAlg.cxx
src/component/NtupleDumper_entries.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib xAODFaserWaveform xAODFaserCalorimeter xAODFaserTrigger xAODFaserLHC ScintIdentifier FaserCaloIdentifier GeneratorObjects FaserActsGeometryLib TrackerSimEvent TrackerSimData TrackerIdentifier TrackerReadoutGeometry TrkTrack GeoPrimitives TrackerRIO_OnTrack TrackerSpacePoint FaserActsKalmanFilterLib FaserActsmanVertexingLib AtlasHepMCLib WaveformConditionsToolsLib
+ LINK_LIBRARIES AthenaBaseComps StoreGateLib xAODFaserWaveform xAODFaserCalorimeter xAODFaserTrigger xAODFaserLHC ScintIdentifier FaserCaloIdentifier GeneratorObjects FaserActsGeometryLib TrackerSimEvent TrackerSimData TrackerIdentifier TrackerReadoutGeometry TrkTrack GeoPrimitives TrackerRIO_OnTrack TrackerSpacePoint FaserActsKalmanFilterLib AtlasHepMCLib WaveformConditionsToolsLib # FIXME: FaserActsmanVertexingLib
PRIVATE_LINK_LIBRARIES nlohmann_json::nlohmann_json )
atlas_install_python_modules( python/*.py )
--
GitLab