From fc23b08b14eb043ed612a317fefd18eeb6a63efb Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:05:51 +0200
Subject: [PATCH 01/32] Prepare GeoModelATLAS build
---
.gitlab-ci.yml | 17 +----------------
CI/compile_GeoModel.sh | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 16 deletions(-)
create mode 100644 CI/compile_GeoModel.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bea51230..74debf0a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,22 +64,7 @@ workflow:
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
script:
- - echo "PWD; LS" # CI debug only
- - pwd; ls # CI debug only
- - ls ../ # CI debug only
- - ls ../../ # CI debug only
- - cmake --version # CI debug only
- - mkdir build
- - cd build
- - echo "CMAKE_ARGS -- ${CMAKE_ARGS}"
- - echo "CMAKE_CONFIG_FLAGS -- ${CMAKE_CONFIG_FLAGS}"
- - echo "CMAKE_EXTRA_FLAGS -- ${CMAKE_EXTRA_FLAGS}"
- - cmake ${CMAKE_ARGS} ${CMAKE_CONFIG_FLAGS} ${CMAKE_EXTRA_FLAGS} .. # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
- - pwd; ls # CI debug only
- - ls ../ # CI debug only
- - ls ../../ # CI debug only
+ - CI/compile_GeoModel.sh
artifacts:
paths:
- install
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
new file mode 100644
index 000000000..845f540e8
--- /dev/null
+++ b/CI/compile_GeoModel.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+echo "Compile GeoModelCore with flags: "
+echo " **** CMAKE_CONFIG_FLAGS: ${CMAKE_CONFIG_FLAGS}"
+echo " **** CMAKE_EXTRA_FLAGS: ${CMAKE_EXTRA_FLAGS}"
+echo " **** CMAKE_ARGS: ${CMAKE_ARGS} "
+
+echo ${PWD}
+
+SOURCE_DIR="${PWD}"
+BUILD_DIR="${SOURCE_DIR}/../build"
+INSTALL_DIR="${SOURCE_DIR}/../install"
+
+mkdir -p ${BUILD_DIR}
+mkdir -p ${INSTALL_DIR}
+
+cd ${BUILD_DIR}
+
+cmake ${CMAKE_CONFIG_FLAGS} \
+ -DCMAKE_CXX_FLAGS="${CMAKE_EXTRA_FLAGS}" \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_INSTALL_PREFIX=../install \
+ ${SOURCE_DIR}
+
+make -j2
+
+make install
+
+ls -lh ${INSTALL_DIR}
+
+export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
+export ROOT_INCLUDE_PATH="${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}"
+export PATH="${INSTALL_DIR}/bin:${PATH}"
+
+echo "export LD_LIBRARY_PATH=\"${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}\""
+echo "export ROOT_INCLUDE_PATH=\"${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}\""
+echo "export PATH=\"${INSTALL_DIR}/bin:${PATH}\""
+
+
--
GitLab
From c616048869a792e25be6848c2673743436f95f2b Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:07:20 +0200
Subject: [PATCH 02/32] Update permissions
---
CI/compile_GeoModel.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 CI/compile_GeoModel.sh
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
old mode 100644
new mode 100755
--
GitLab
From b3f09b0dfc3bbc933b10c5de89471adbcaaf740f Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:10:38 +0200
Subject: [PATCH 03/32] More verbose
---
CI/compile_GeoModel.sh | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 845f540e8..82d3b6c2f 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -9,12 +9,16 @@ echo ${PWD}
SOURCE_DIR="${PWD}"
BUILD_DIR="${SOURCE_DIR}/../build"
-INSTALL_DIR="${SOURCE_DIR}/../install"
+INSTALL_DIR="${SOURCE_DIR}/install"
mkdir -p ${BUILD_DIR}
mkdir -p ${INSTALL_DIR}
+echo "mkdir -p ${BUILD_DIR}"
+echo "mkdir -p ${INSTALL_DIR}"
+
cd ${BUILD_DIR}
+echo "cd ${BUILD_DIR}"
cmake ${CMAKE_CONFIG_FLAGS} \
-DCMAKE_CXX_FLAGS="${CMAKE_EXTRA_FLAGS}" \
@@ -22,7 +26,14 @@ cmake ${CMAKE_CONFIG_FLAGS} \
-DCMAKE_INSTALL_PREFIX=../install \
${SOURCE_DIR}
-make -j2
+echo "cmake ${CMAKE_CONFIG_FLAGS} \
+ -DCMAKE_CXX_FLAGS=\"${CMAKE_EXTRA_FLAGS}\" \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_INSTALL_PREFIX=../install \
+ ${SOURCE_DIR}"
+
+
+make -j4
make install
--
GitLab
From a1d66856ce02cde19bdfb99e9865f549409e657a Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:40:09 +0200
Subject: [PATCH 04/32] Does that work?
---
.gitlab-ci.yml | 44 +++++++-----------------------------------
CI/compile_GeoModel.sh | 11 ++++++++---
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74debf0a6..0958e70c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,6 @@ stages:
# List global variables
variables:
- CMAKE_DEPS_BASE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install
- CMAKE_BASE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install
# also, 'CMAKE_EXTRA_FLAGS' will be specified by specific jobs when needed, and used by job templates like 'geomodel-job'
GIT_SUBMODULE_STRATEGY: recursive
@@ -61,8 +59,6 @@ workflow:
# TEMPLATES FOR BUILDING PACKAGES
.geomodel-build-template: &geomodel-job
- variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
script:
- CI/compile_GeoModel.sh
artifacts:
@@ -118,8 +114,7 @@ debug-job:
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-# CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_TOOLS=TRUE
+# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_TOOLS=TRUE
# mac-gm-visualization:
# <<: *macos-job
@@ -127,8 +122,7 @@ debug-job:
# stage: step-C
# needs: ["mac-coin", "mac-soqt"]
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-# CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE
+# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE
# mac-gm-examples:
# <<: *macos-job
@@ -136,7 +130,6 @@ debug-job:
# stage: step-A
# # needs: ["mac-config"]
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES=TRUE
# mac-gm-gmg4:
@@ -144,7 +137,6 @@ debug-job:
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
# mac-gm-examples-gmg4:
@@ -152,7 +144,6 @@ debug-job:
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
# mac-gm-fullsimlight:
@@ -160,7 +151,6 @@ debug-job:
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
# mac-gm-fsl:
@@ -168,8 +158,7 @@ debug-job:
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-# CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
+# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
# mac-gm-all:
# <<: *macos-job
@@ -177,15 +166,13 @@ debug-job:
# stage: step-C
# needs: ["mac-coin", "mac-soqt"]
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-# CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
+# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
# mac-gm-atlasextras:
# <<: *macos-job
# <<: *geomodel-job
# stage: step-A
# variables:
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ATLASEXTENSIONS=TRUE
@@ -198,15 +185,12 @@ ubu-gm-base:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
- variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
ubu-gm-tools:
<<: *ubuntu-job
<<: *geomodel-job
stage: step-A
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_TOOLS=TRUE
@@ -215,7 +199,6 @@ ubu-gm-visualization:
<<: *geomodel-job
stage: step-C
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE
ubu-gm-examples:
@@ -223,7 +206,6 @@ ubu-gm-examples:
<<: *geomodel-job
stage: step-A
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES=TRUE
@@ -232,7 +214,6 @@ ubu-gm-examples-gmg4:
<<: *geomodel-job
stage: step-B
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
ubu-gm-gmg4:
@@ -240,7 +221,6 @@ ubu-gm-gmg4:
<<: *geomodel-job
stage: step-B
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
@@ -249,7 +229,6 @@ ubu-gm-fullsimlight:
<<: *geomodel-job
stage: step-B
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
@@ -258,7 +237,6 @@ ubu-gm-fsl:
<<: *geomodel-job
stage: step-B
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
@@ -267,7 +245,6 @@ ubu-gm-all:
<<: *geomodel-job
stage: step-C
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
artifacts:
paths:
@@ -280,7 +257,6 @@ ubu-gm-atlasextras:
<<: *geomodel-job
stage: step-B
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ATLASEXTENSIONS=TRUE
#TODO: this does not work properly. Needs some work...
@@ -290,9 +266,7 @@ ubu-gm-atlasextras:
# stage: step-C
# variables:
# XERCESC_VERSION: 3.2.3
-# CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
-# CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DXercesC_INCLUDE_DIR=../install/xerces-c-${XERCESC_VERSION}/include -DXercesC_LIBRARY=../install/xerces-c-${XERCESC_VERSION}/lib/libxerces-c.dylib
+# CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DXercesC_INCLUDE_DIR=../install/xerces-c-${XERCESC_VERSION}/include -DXercesC_LIBRARY=../install/xerces-c-${XERCESC_VERSION}/lib/libxerces-c.dylib
# rules:
# - when: manual
@@ -314,11 +288,7 @@ ubu-single-gmbase:
variables:
CMAKE_ARGS: ${CMAKE_BASE_ARGS}
script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} .. # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ - CI/compile_GeoModel.sh
artifacts:
paths:
- install
@@ -397,7 +367,7 @@ ubu-single-gmfsl:
stage: step-E
needs: ["ubu-single-gmfullsimlight"]
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+ SOURCE_DIR: ${CMAKE_PROJECT_DIR}/FSL
script:
- mkdir build
- cd build
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 82d3b6c2f..7da0c49d2 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -3,11 +3,16 @@
echo "Compile GeoModelCore with flags: "
echo " **** CMAKE_CONFIG_FLAGS: ${CMAKE_CONFIG_FLAGS}"
echo " **** CMAKE_EXTRA_FLAGS: ${CMAKE_EXTRA_FLAGS}"
-echo " **** CMAKE_ARGS: ${CMAKE_ARGS} "
-echo ${PWD}
+if [ -z "${SOURCE_DIR}" ]; then
+ SOURCE_DIR="${PWD}"
+fi
+
+
+echo "SOURCE_DIR=\"${SOURCE_DIR}\""
+echo "BUILD_DIR=\"${SOURCE_DIR}/../build\""
+echo "INSTALL_DIR=\"${SOURCE_DIR}/install\""
-SOURCE_DIR="${PWD}"
BUILD_DIR="${SOURCE_DIR}/../build"
INSTALL_DIR="${SOURCE_DIR}/install"
--
GitLab
From 84cdabdba2590962df0ddcd804e94ad3303449ee Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:48:17 +0200
Subject: [PATCH 05/32] Define libs
---
CI/compile_GeoModel.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 7da0c49d2..9ac3fa540 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -25,6 +25,15 @@ echo "mkdir -p ${INSTALL_DIR}"
cd ${BUILD_DIR}
echo "cd ${BUILD_DIR}"
+export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
+export ROOT_INCLUDE_PATH="${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}"
+export PATH="${INSTALL_DIR}/bin:${PATH}"
+
+echo "export LD_LIBRARY_PATH=\"${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}\""
+echo "export ROOT_INCLUDE_PATH=\"${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}\""
+echo "export PATH=\"${INSTALL_DIR}/bin:${PATH}\""
+
+
cmake ${CMAKE_CONFIG_FLAGS} \
-DCMAKE_CXX_FLAGS="${CMAKE_EXTRA_FLAGS}" \
-DCMAKE_BUILD_TYPE=Debug \
@@ -44,12 +53,3 @@ make install
ls -lh ${INSTALL_DIR}
-export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
-export ROOT_INCLUDE_PATH="${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}"
-export PATH="${INSTALL_DIR}/bin:${PATH}"
-
-echo "export LD_LIBRARY_PATH=\"${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}\""
-echo "export ROOT_INCLUDE_PATH=\"${INSTALL_DIR}/include:${ROOT_INCLUDE_PATH}\""
-echo "export PATH=\"${INSTALL_DIR}/bin:${PATH}\""
-
-
--
GitLab
From 49fe1d1fbfff0c0d6fc141851e6671b306976646 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 12:53:12 +0200
Subject: [PATCH 06/32] Try to fix ubu-single-gmbatools
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0958e70c6..7893d3649 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -299,13 +299,13 @@ ubu-single-gmtools:
stage: step-B
needs: ["ubu-single-gmbase"]
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} ../GeoModelTools # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ SOURCE_DIR: ${CI_PROJECT_DIR}/GeoModelTools
+# script:
+# - mkdir build
+# - cd build
+# - cmake ${CMAKE_ARGS} ../GeoModelTools # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
+# - cmake --build . -- -j2
+# - cmake --build . -- install
artifacts:
paths:
- install
--
GitLab
From d372c60b6f6902d83f86fc341fa0af0ad07774e4 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:00:15 +0200
Subject: [PATCH 07/32] Fix syntax?
---
.gitlab-ci.yml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7893d3649..4db1cf3b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -299,13 +299,8 @@ ubu-single-gmtools:
stage: step-B
needs: ["ubu-single-gmbase"]
variables:
- SOURCE_DIR: ${CI_PROJECT_DIR}/GeoModelTools
-# script:
-# - mkdir build
-# - cd build
-# - cmake ${CMAKE_ARGS} ../GeoModelTools # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
-# - cmake --build . -- -j2
-# - cmake --build . -- install
+ SOURCE_DIR: "${CI_PROJECT_DIR}/GeoModelTools"
+
artifacts:
paths:
- install
--
GitLab
From f061bfb538dd793048fa781b329a28d011e08c86 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:07:49 +0200
Subject: [PATCH 08/32] script?
---
.gitlab-ci.yml | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4db1cf3b6..1eb7e3bb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,20 +41,14 @@ workflow:
- export CPPFLAGS="-I/usr/local/opt/expat/include"
- export PATH="/usr/local/opt/qt5/bin:$PATH" # to make Qt5 discoverable by CMake
-
-# general Ubuntu job template
-.ubuntu-template-job-base: &ubuntu-job-base
- image: gitlab-registry.cern.ch/geomodeldev/ubuntu-geant4-image:main-base
- rules:
- - when: always
-
-
# NOTE
# The Ubuntu package 'nlohmann-json-dev' is version 2.x, too old for us.
# Thus, for GeoModelVisualization (GMEX), we now build nlohmann_json as part
# of the build, by using the 'standalone' job only
.ubuntu-template-job-default: &ubuntu-job
- <<: *ubuntu-job-base
+ image: gitlab-registry.cern.ch/geomodeldev/ubuntu-geant4-image:main-base
+ rules:
+ - when: always
# TEMPLATES FOR BUILDING PACKAGES
@@ -300,6 +294,8 @@ ubu-single-gmtools:
needs: ["ubu-single-gmbase"]
variables:
SOURCE_DIR: "${CI_PROJECT_DIR}/GeoModelTools"
+ script:
+ - CI/compile_GeoModel.sh
artifacts:
paths:
--
GitLab
From 4252494a18ad8fa68372265e9c88fff9fddc262b Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:11:40 +0200
Subject: [PATCH 09/32] List dir INSTALL_DIR
---
CI/compile_GeoModel.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 9ac3fa540..5fbd06c94 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -18,7 +18,7 @@ INSTALL_DIR="${SOURCE_DIR}/install"
mkdir -p ${BUILD_DIR}
mkdir -p ${INSTALL_DIR}
-
+ls -lh ${INSTALL_DIR}
echo "mkdir -p ${BUILD_DIR}"
echo "mkdir -p ${INSTALL_DIR}"
--
GitLab
From 690cf357ae281e95875976f644b271b68e1b5443 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:17:07 +0200
Subject: [PATCH 10/32] CI_PROJECT_DIR
---
CI/compile_GeoModel.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 5fbd06c94..b8a5b3f31 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -10,11 +10,11 @@ fi
echo "SOURCE_DIR=\"${SOURCE_DIR}\""
-echo "BUILD_DIR=\"${SOURCE_DIR}/../build\""
-echo "INSTALL_DIR=\"${SOURCE_DIR}/install\""
+echo "BUILD_DIR=\"${CI_PROJECT_DIR}/../build\""
+echo "INSTALL_DIR=\"${CI_PROJECT_DIR}/install\""
-BUILD_DIR="${SOURCE_DIR}/../build"
-INSTALL_DIR="${SOURCE_DIR}/install"
+BUILD_DIR="${CI_PROJECT_DIR}/../build"
+INSTALL_DIR="${CI_PROJECT_DIR}/install"
mkdir -p ${BUILD_DIR}
mkdir -p ${INSTALL_DIR}
--
GitLab
From da95cd29eb1fbdc770781d6b8fc60e99f1e49e5a Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:21:50 +0200
Subject: [PATCH 11/32] ICh depp
---
CI/compile_GeoModel.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index b8a5b3f31..b90840dbe 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -37,13 +37,13 @@ echo "export PATH=\"${INSTALL_DIR}/bin:${PATH}\""
cmake ${CMAKE_CONFIG_FLAGS} \
-DCMAKE_CXX_FLAGS="${CMAKE_EXTRA_FLAGS}" \
-DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_INSTALL_PREFIX=../install \
+ -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 \
+ -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
${SOURCE_DIR}"
--
GitLab
From 21b44f6a818d759d4eafd4790dc89d50e2faa62f Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:30:40 +0200
Subject: [PATCH 12/32] Try to adapt other jobs
---
.gitlab-ci.yml | 38 ++++++++++----------------------------
1 file changed, 10 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1eb7e3bb5..6df4f92c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,58 +300,44 @@ ubu-single-gmtools:
artifacts:
paths:
- install
- expire_in: 1 day
+ expire_in: 8 hours
ubu-single-gmviz:
<<: *ubuntu-job
stage: step-C
needs: ["ubu-single-gmbase"]
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+ SOURCE_DIR: "${CI_PROJECT_DIR}/GeoModelVisualization"
script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} ../GeoModelVisualization # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ - CI/compile_GeoModel.sh
artifacts:
paths:
- install
- expire_in: 1 day
+ expire_in: 8 hours
ubu-single-gmg4:
<<: *ubuntu-job
stage: step-C
needs: ["ubu-single-gmbase"]
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+ SOURCE_DIR: "${CI_PROJECT_DIR}/GeoModelG4"
script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} ../GeoModelG4 # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ - CI/compile_GeoModel.sh
artifacts:
paths:
- install
- expire_in: 1 day
+ expire_in: 8 hours
ubu-single-gmfullsimlight:
<<: *ubuntu-job
stage: step-D
needs: ["ubu-single-gmg4"]
variables:
- CMAKE_ARGS: ${CMAKE_BASE_ARGS}
- script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} ../FullSimLight # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ SOURCE_DIR: "${CI_PROJECT_DIR}/FullSimLight"
artifacts:
paths:
- install
- expire_in: 1 day
+ expire_in: 8 hours
ubu-single-gmfsl:
<<: *ubuntu-job
@@ -360,11 +346,7 @@ ubu-single-gmfsl:
variables:
SOURCE_DIR: ${CMAKE_PROJECT_DIR}/FSL
script:
- - mkdir build
- - cd build
- - cmake ${CMAKE_ARGS} ../FSL # the CMAKE_EXTRA_FLAGS are set by specific jobs when needed
- - cmake --build . -- -j2
- - cmake --build . -- install
+ - CI/compile_GeoModel.sh
#####################
--
GitLab
From 41dfac83a91b94cc2ea9e11369cd53b24c8c23fc Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:32:15 +0200
Subject: [PATCH 13/32] Back to day
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6df4f92c8..d7cb6fd65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,7 +300,7 @@ ubu-single-gmtools:
artifacts:
paths:
- install
- expire_in: 8 hours
+ expire_in: 1 day
ubu-single-gmviz:
<<: *ubuntu-job
@@ -313,7 +313,7 @@ ubu-single-gmviz:
artifacts:
paths:
- install
- expire_in: 8 hours
+ expire_in: 1 day
ubu-single-gmg4:
<<: *ubuntu-job
@@ -326,7 +326,7 @@ ubu-single-gmg4:
artifacts:
paths:
- install
- expire_in: 8 hours
+ expire_in: 1 day
ubu-single-gmfullsimlight:
<<: *ubuntu-job
@@ -337,7 +337,7 @@ ubu-single-gmfullsimlight:
artifacts:
paths:
- install
- expire_in: 8 hours
+ expire_in: 1 day
ubu-single-gmfsl:
<<: *ubuntu-job
--
GitLab
From 9a8597f157ac2e67a631a225b10069a7781d6696 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:33:46 +0200
Subject: [PATCH 14/32] Add script
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7cb6fd65..73d30fc46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -334,6 +334,8 @@ ubu-single-gmfullsimlight:
needs: ["ubu-single-gmg4"]
variables:
SOURCE_DIR: "${CI_PROJECT_DIR}/FullSimLight"
+ script:
+ - CI/compile_GeoModel.sh
artifacts:
paths:
- install
--
GitLab
From a1388684ba00e895edf7a69d220bacea411e96b4 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:43:36 +0200
Subject: [PATCH 15/32] Reshuffle jobs
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73d30fc46..073f9d34b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,14 +206,14 @@ ubu-gm-examples:
ubu-gm-examples-gmg4:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-B
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
ubu-gm-gmg4:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-B
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
@@ -221,7 +221,7 @@ ubu-gm-gmg4:
ubu-gm-fullsimlight:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-B
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE
@@ -229,7 +229,7 @@ ubu-gm-fullsimlight:
ubu-gm-fsl:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-B
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_FSL=TRUE
@@ -249,7 +249,7 @@ ubu-gm-all:
ubu-gm-atlasextras:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-B
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ATLASEXTENSIONS=TRUE
--
GitLab
From 3909a0248ac48fb94476e903ff836d806efa1147 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:44:41 +0200
Subject: [PATCH 16/32] That slipped through
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 073f9d34b..7cd3c158f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,7 +237,7 @@ ubu-gm-fsl:
ubu-gm-all:
<<: *ubuntu-job
<<: *geomodel-job
- stage: step-C
+ stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
artifacts:
--
GitLab
From 98c1c59de6529fe725546c540611538a5f1d1bb7 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:53:16 +0200
Subject: [PATCH 17/32] First GeoATLAS attempt
---
.gitlab-ci.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cd3c158f..2be5fb711 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,7 +350,12 @@ ubu-single-gmfsl:
script:
- CI/compile_GeoModel.sh
-
+ubu-geomodelatlas:
+ << *ubuntu-job
+ stage: step-B
+ needs : ["ubu-gm-all"]
+ script:
+ - git clone https://:@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
#####################
### Documentation ###
#####################
--
GitLab
From 5855d7619d8726195a00390cd2a2cea255652416 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 13:54:16 +0200
Subject: [PATCH 18/32] Typo
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2be5fb711..8d1400ac4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -351,7 +351,7 @@ ubu-single-gmfsl:
- CI/compile_GeoModel.sh
ubu-geomodelatlas:
- << *ubuntu-job
+ <<: *ubuntu-job
stage: step-B
needs : ["ubu-gm-all"]
script:
--
GitLab
From 1c29cc4759cb1f2169c3ba0f36818d0665c840fc Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 14:02:40 +0200
Subject: [PATCH 19/32] Update path
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d1400ac4..2ceac23fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -242,7 +242,7 @@ ubu-gm-all:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
artifacts:
paths:
- - build
+ - ${CI_PROJECT_DIR}/../build
expire_in: 30 minutes
--
GitLab
From 4504de5fc4bb7079e66fda1a9beefdd67cc9837f Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 14:22:55 +0200
Subject: [PATCH 20/32] Move the build dir
---
.gitlab-ci.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ceac23fe..fcfc8829a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,9 +240,13 @@ ubu-gm-all:
stage: step-A
variables:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
+ script:
+ - CI/compile_GeoModel.sh
+ - mv ${BUILD_DIR} ./
artifacts:
paths:
- - ${CI_PROJECT_DIR}/../build
+ - build
+ - install
expire_in: 30 minutes
--
GitLab
From b4a247af33e06a1767196ac0be68b84e1888f198 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 14:30:50 +0200
Subject: [PATCH 21/32] BUILD_DIR is not exported
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcfc8829a..eca74b178 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -242,7 +242,7 @@ ubu-gm-all:
CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
script:
- CI/compile_GeoModel.sh
- - mv ${BUILD_DIR} ./
+ - mv ${CI_PROJECT_DIR}/../build ./
artifacts:
paths:
- build
--
GitLab
From a2b27433a1ab7685f6ddb6820d64d5627596859b Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Mon, 29 Apr 2024 14:39:25 +0200
Subject: [PATCH 22/32] Move build
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eca74b178..1f7507481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -508,7 +508,8 @@ tests-ubuntu:
needs: ["ubu-gm-all"]
stage: test
script:
- - cd build
+ - mv build ../
+ - cd ../build
- ctest #--output-on-failure
include:
--
GitLab
From 40123d5d9dca3dd16b7a7b9ea35f280886c1eb55 Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 8 May 2024 08:41:35 +0200
Subject: [PATCH 23/32] Apply 1 suggestion(s) to 1 file(s)
---
CI/compile_GeoModel.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index b90840dbe..462739c79 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -8,7 +8,7 @@ if [ -z "${SOURCE_DIR}" ]; then
SOURCE_DIR="${PWD}"
fi
-
+export
echo "SOURCE_DIR=\"${SOURCE_DIR}\""
echo "BUILD_DIR=\"${CI_PROJECT_DIR}/../build\""
echo "INSTALL_DIR=\"${CI_PROJECT_DIR}/install\""
--
GitLab
From a8be129e2a0e183462d7a87339f686e8057d6244 Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 8 May 2024 08:49:32 +0200
Subject: [PATCH 24/32] Apply 1 suggestion(s) to 1 file(s)
---
CI/compile_GeoModel.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 462739c79..8917d09eb 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -8,7 +8,7 @@ if [ -z "${SOURCE_DIR}" ]; then
SOURCE_DIR="${PWD}"
fi
-export
+ 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\""
--
GitLab
From f0bdbfa9a24e3c906e2570c6082662f919bc029e Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 8 May 2024 08:52:29 +0200
Subject: [PATCH 25/32] Update 2 files
- /CI/compile_GeoModel.sh
- /.gitlab-ci.yml
---
.gitlab-ci.yml | 2 ++
CI/compile_GeoModel.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f7507481..c5e264d2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,7 +359,9 @@ ubu-geomodelatlas:
stage: step-B
needs : ["ubu-gm-all"]
script:
+ - echo "${EOS_ACCOUNT_PASSWORD}" | kinit ${EOS_ACCOUNT_USERNAME}@CERN.CH
- git clone https://:@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
+ - ls -lh
#####################
### Documentation ###
#####################
diff --git a/CI/compile_GeoModel.sh b/CI/compile_GeoModel.sh
index 8917d09eb..864edae95 100755
--- a/CI/compile_GeoModel.sh
+++ b/CI/compile_GeoModel.sh
@@ -8,7 +8,7 @@ if [ -z "${SOURCE_DIR}" ]; then
SOURCE_DIR="${PWD}"
fi
- echo "${EOS_ACCOUNT_PASSWORD}" | kinit ${EOS_ACCOUNT_USERNAME}@CERN.CH
+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\""
--
GitLab
From 1666488a08c41900d36479cac7725a86db6b7e69 Mon Sep 17 00:00:00 2001
From: Johannes Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Wed, 8 May 2024 09:20:23 +0200
Subject: [PATCH 26/32] Update file .gitlab-ci.yml
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5e264d2b..eea3ca8e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,8 +359,7 @@ ubu-geomodelatlas:
stage: step-B
needs : ["ubu-gm-all"]
script:
- - echo "${EOS_ACCOUNT_PASSWORD}" | kinit ${EOS_ACCOUNT_USERNAME}@CERN.CH
- - git clone https://:@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
+ - git clone https://${EOS_ACCOUNT_USERNAME}:${EOS_ACCOUNT_PASSWORD}@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
#####################
### Documentation ###
--
GitLab
From bef8f8591ea8205fc78f7726cc6e29e67459ef66 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 15:37:11 +0200
Subject: [PATCH 27/32] Does that clone
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eea3ca8e3..2ca6e0efa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -356,10 +356,10 @@ ubu-single-gmfsl:
ubu-geomodelatlas:
<<: *ubuntu-job
- stage: step-B
- needs : ["ubu-gm-all"]
+ stage: step-A
+ #needs : ["ubu-gm-all"]
script:
- - git clone https://${EOS_ACCOUNT_USERNAME}:${EOS_ACCOUNT_PASSWORD}@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
+ - git clone https://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
#####################
### Documentation ###
--
GitLab
From f1dcfc1bdb5c3ad2bc60c300b6ca4d234dfaa1f8 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 15:49:50 +0200
Subject: [PATCH 28/32] Another trial
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ca6e0efa..b091491d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,7 +359,7 @@ ubu-geomodelatlas:
stage: step-A
#needs : ["ubu-gm-all"]
script:
- - git clone https://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch:8443/atlas/geomodelatlas/GeoModelATLAS.git
+ - git clone ssh://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch:7999/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
#####################
### Documentation ###
--
GitLab
From 1b6842e2ad1679c6625ba1cde0f95b66863647fa Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 15:51:52 +0200
Subject: [PATCH 29/32] Maeh
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b091491d6..5c1ee5807 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,7 +359,7 @@ ubu-geomodelatlas:
stage: step-A
#needs : ["ubu-gm-all"]
script:
- - git clone ssh://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch:7999/atlas/geomodelatlas/GeoModelATLAS.git
+ - git clone https://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
#####################
### Documentation ###
--
GitLab
From d7b542b4772768890a4f9bbb7207e09152e2508e Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 15:56:12 +0200
Subject: [PATCH 30/32] This one?
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c1ee5807..58b482a97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -356,10 +356,10 @@ ubu-single-gmfsl:
ubu-geomodelatlas:
<<: *ubuntu-job
- stage: step-A
- #needs : ["ubu-gm-all"]
+ stage: step-B
+ needs : ["ubu-gm-all"]
script:
- - git clone https://gitlab-ci-token:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS.git
+ - git clone https://${EOS_ACCOUNT_USERNAME}:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
#####################
### Documentation ###
--
GitLab
From 0b3a4025747374ecd4b85e7887681f70c1892e37 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 16:00:15 +0200
Subject: [PATCH 31/32] Clone can be checked faster
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58b482a97..2615a47c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -356,8 +356,8 @@ ubu-single-gmfsl:
ubu-geomodelatlas:
<<: *ubuntu-job
- stage: step-B
- needs : ["ubu-gm-all"]
+ stage: step-A
+ #needs : ["ubu-gm-all"]
script:
- git clone https://${EOS_ACCOUNT_USERNAME}:${GEOMODEL_READ_ACCESS}@gitlab.cern.ch/atlas/geomodelatlas/GeoModelATLAS.git
- ls -lh
--
GitLab
From ce37e1af30307bff86dd4b07a233b24059e7cc11 Mon Sep 17 00:00:00 2001
From: Johannes Josef Junggeburth <johannes.josef.junggeburth@cern.ch>
Date: Tue, 14 May 2024 16:11:58 +0200
Subject: [PATCH 32/32] Full test
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2615a47c7..40be5007b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -356,11 +356,14 @@ ubu-single-gmfsl:
ubu-geomodelatlas:
<<: *ubuntu-job
- stage: step-A
- #needs : ["ubu-gm-all"]
+ stage: step-B
+ needs : ["ubu-gm-all"]
+ variables:
+ SOURCE_DIR: ${CMAKE_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
#####################
### Documentation ###
#####################
--
GitLab