Draft: Athena CI 2025

athena_ci/ci.yml

@@ -2,14 +2,14 @@ build_geomodel_athena:
   image: gitlab-registry.cern.ch/atlas-sit/docker/alma9-atlasos-dev
 
   stage: step-A
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-      - GeoModelCore/**/*
-      - GeoModelIO/**/*
-      - GeoModelTools/**/*
-      - cmake/**/*
-      - CMakeLists.txt
+  # rules:
+  #   - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  #     changes:
+  #     - GeoModelCore/**/*
+  #     - GeoModelIO/**/*
+  #     - GeoModelTools/**/*
+  #     - cmake/**/*
+  #     - CMakeLists.txt
 
   variables:
     CCACHE_KEY_SUFFIX: r2
@@ -34,10 +34,7 @@ build_geomodel_athena:
 
   artifacts:
     paths:
-      - geomodel-install
-      # - athena-build
-      - athena-install
-      - .asetup.save
+      - build
     expire_in: 4 hours
 
   before_script:
@@ -46,12 +43,28 @@ build_geomodel_athena:
   script:
     - git config --global user.name gitlab
     - git config --global user.email cijob@example.com
-    - echo $CI_MERGE_REQUEST_PROJECT_ID
-    - echo $CI_MERGE_REQUEST_IID
-    - export HEADERS_CHANGED=$(curl -s https://gitlab.cern.ch/api/v4/projects/${CI_MERGE_REQUEST_PROJECT_ID}/merge_requests/${CI_MERGE_REQUEST_IID}/changes | jq -r .changes[].new_path | grep -e "\.h$" > /dev/null ; printf $?)
-    - export IS_MERGE_REQUEST=$([ $CI_PIPELINE_SOURCE = "merge_request_event" ]; printf $?)
-    - athena_ci/athena_build.sh
-
+    - git config --global --add safe.directory /builds/GeoModelDev/GeoModel
+
+    # @TODO: Change to tag or something
+    - git clone https://gitlab.cern.ch/acts/acts-athena-ci.git -b new-outer-script acts-athena-ci
+
+    # @TODO: Add custom patches folder to be applied
+    - >-
+         acts-athena-ci/build.py
+         --directory build
+         --athena-ref ${ATHENA_REF}
+         --athena-repo ${ATHENA_GIT_REPO}
+         --athena-release ${ATHENA_RELEASE}
+         --acts-repo https://github.com/acts-project/acts.git
+         --acts-ref auto
+         --build-geomodel
+         --geomodel-source $PWD
+         --add-package-filters athena_ci/package_filters.txt
+         --jobs 8
+         --jobs-athena 4
+
+    - rm -rf build/acts-build build/athena-build build/geomodel-build
+      
 
 .run_base:
   stage: step-B
@@ -109,9 +122,8 @@ build_geomodel_athena:
         ../athena_ci/apply_patches.sh
         popd
 
-    - source athena-install/setup.sh
-    - export LD_LIBRARY_PATH=$PWD/geomodel-install/lib64:$LD_LIBRARY_PATH
-    - mkdir -p run
+    - source build/setup.sh
+    - mkdir run
 
 
 ################################################