From f742d3516616b323c6def5410a1fb3872150435a Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:36:40 +0100
Subject: [PATCH 1/8] try new script
---
athena_ci/ci.yml | 29 +++++++++++++++++------------
athena_ci/patch_package_filters.txt | 2 --
2 files changed, 17 insertions(+), 14 deletions(-)
delete mode 100644 athena_ci/patch_package_filters.txt
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index 3d56cbd6f..ba0aee12a 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -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,21 @@ 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 clone https://gitlab.cern.ch/acts/acts-athena-ci.git -b 8cca49cd 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
+
+ - rm -rf build/acts-build build/athena-build build/geomodel-build
+
.run_base:
stage: step-B
@@ -109,9 +115,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
################################################
diff --git a/athena_ci/patch_package_filters.txt b/athena_ci/patch_package_filters.txt
deleted file mode 100644
index f5d158999..000000000
--- a/athena_ci/patch_package_filters.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# These Athena packages need to be rebuilt
-# due to patches in the `patches` directory
--
GitLab
From 2f9c7976c4a16bfa01420f3e4eff837feeee1dea Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:38:01 +0100
Subject: [PATCH 2/8] Add GM build instructions
---
athena_ci/ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index ba0aee12a..aa205b799 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -55,6 +55,9 @@ build_geomodel_athena:
--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
- rm -rf build/acts-build build/athena-build build/geomodel-build
--
GitLab
From 49e20ac4083df374e028874c8f94d5e8db97eff8 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:38:26 +0100
Subject: [PATCH 3/8] always run
---
athena_ci/ci.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index aa205b799..ef6662944 100644
--- a/athena_ci/ci.yml
+++ b/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
--
GitLab
From 815374d7e916506262c73785756c4168685258eb Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:41:07 +0100
Subject: [PATCH 4/8] clone src
---
athena_ci/ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index ef6662944..e7032ca56 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -44,7 +44,8 @@ build_geomodel_athena:
- git config --global user.name gitlab
- git config --global user.email cijob@example.com
- - git clone https://gitlab.cern.ch/acts/acts-athena-ci.git -b 8cca49cd acts-athena-ci
+ # @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
- >-
--
GitLab
From 60b7c8fc972b0a4b060af58c82a454bfe6385e7d Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:44:10 +0100
Subject: [PATCH 5/8] yaml
---
athena_ci/ci.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index e7032ca56..9507852af 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -49,16 +49,16 @@ build_geomodel_athena:
# @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
+ 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
- rm -rf build/acts-build build/athena-build build/geomodel-build
--
GitLab
From daaab75d5fff76292e8a28ba68ec1b2f732f0159 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:47:41 +0100
Subject: [PATCH 6/8] again yaml
---
athena_ci/ci.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index 9507852af..cd9b065e2 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -50,15 +50,15 @@ build_geomodel_athena:
# @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
+ --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
- rm -rf build/acts-build build/athena-build build/geomodel-build
--
GitLab
From ccc2127e361e37a4fd4ac9ce462977219e492fe7 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Fri, 31 Jan 2025 20:54:22 +0100
Subject: [PATCH 7/8] safe directory
---
athena_ci/ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index cd9b065e2..61e2ae4c6 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -43,6 +43,7 @@ build_geomodel_athena:
script:
- git config --global user.name gitlab
- git config --global user.email cijob@example.com
+ - 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
--
GitLab
From c7c6764038ee4b032b6ad7f29fc04ffb8066a665 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Sat, 1 Feb 2025 08:21:22 +0100
Subject: [PATCH 8/8] limit jobs
---
athena_ci/ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/athena_ci/ci.yml b/athena_ci/ci.yml
index 61e2ae4c6..790deae1e 100644
--- a/athena_ci/ci.yml
+++ b/athena_ci/ci.yml
@@ -60,6 +60,8 @@ build_geomodel_athena:
--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
--
GitLab