Merge remote-tracking branch 'origin/main' into R4ShapesToNewDB

.gitlab-ci.yml

@@ -350,7 +350,7 @@ ubu-single-gmfsl:
   stage: step-E
   needs: ["ubu-single-gmfullsimlight"]
   variables:
-      SOURCE_DIR: ${CMAKE_PROJECT_DIR}/FSL
+      SOURCE_DIR: ${CI_PROJECT_DIR}/FSL
   script:
     - CI/compile_GeoModel.sh
 
@@ -359,7 +359,7 @@ ubu-geomodelatlas:
   stage: step-B
   needs : ["ubu-gm-all"]
   variables:
-      SOURCE_DIR: ${CMAKE_PROJECT_DIR}/GeoModelATLAS
+      SOURCE_DIR: ${CI_PROJECT_DIR}/GeoModelATLAS
   script:
     - git clone https://${EOS_ACCOUNT_USERNAME}:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS.git
     - ls -lh

CI/compile_GeoModel.sh

@@ -8,7 +8,6 @@ if [ -z "${SOURCE_DIR}" ]; then
     SOURCE_DIR="${PWD}"
 fi
 
-echo "${EOS_ACCOUNT_PASSWORD}" | kinit ${EOS_ACCOUNT_USERNAME}@CERN.CH
 echo "SOURCE_DIR=\"${SOURCE_DIR}\""
 echo "BUILD_DIR=\"${CI_PROJECT_DIR}/../build\""
 echo "INSTALL_DIR=\"${CI_PROJECT_DIR}/install\""
@@ -34,22 +33,41 @@ echo "export ROOT_INCLUDE_PATH=\"${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}\""
 echo "export PATH=\"${INSTALL_DIR}/bin:${PATH}\""
 
 
+echo "cmake ${CMAKE_CONFIG_FLAGS} \
+    -DCMAKE_CXX_FLAGS=\"${CMAKE_EXTRA_FLAGS}\" \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
+     ${SOURCE_DIR}"
+
 cmake ${CMAKE_CONFIG_FLAGS} \
     -DCMAKE_CXX_FLAGS="${CMAKE_EXTRA_FLAGS}" \
     -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
      ${SOURCE_DIR}
 
-echo "cmake ${CMAKE_CONFIG_FLAGS} \
-    -DCMAKE_CXX_FLAGS=\"${CMAKE_EXTRA_FLAGS}\" \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
-     ${SOURCE_DIR}"
+result=$?
+if [ ${result} -ne 0 ];then 
+   echo "Cmake failed"
+   exit 1
+fi
+
 
 
 make -j4
 
+result=$?
+if [ ${result} -ne 0 ];then 
+   echo "Compilation failed"
+   exit 1
+fi
+
 make install
 
+result=$?
+if [ ${result} -ne 0 ];then 
+   echo "Installation failed"
+   exit 1
+fi
+
 ls -lh ${INSTALL_DIR}
 

athena_ci/athena_build.sh

@@ -230,7 +230,7 @@ if [ -z "$CI" ]; then
   heading "Interactive mode, dropping into shell"
   bash
 else
-  VERBOSE=1 cmake --build athena-build -- -j3
+  cmake --build athena-build -- -j3
   $CCACHE -s
   cmake --install athena-build > athena_install.log
 fi