From 002c74bf9158699d39836e13d58e8874a57a6708 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Fri, 3 Jul 2020 23:45:49 +0200
Subject: [PATCH] CI: add G4-ready image to GeoModelG4 and FullSimLight builds
---
.gitlab-ci.yml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c31232a5a..437b3324a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,16 @@ variables:
- apt-get update -qq && apt-get install -y -qq git cmake wget unzip build-essential freeglut3-dev libboost-all-dev qt5-default mercurial libeigen3-dev libsqlite3-dev
+.ubuntu-template-job-registry: &ubuntu-job-registry
+ image: gitlab-registry.cern.ch/mbandier/geant4-ubuntu/base-image:1.1
+ tags:
+ - docker
+ before_script:
+ - apt-get update -qq && apt-get install -y -qq libeigen3-dev libsqlite3-dev
+
+
+# TEMPLATES FOR BUILDING PACKAGES
-# TEMPLATES FOR PACKAGES
.coin-build-template: &coin-job
stage: step-A
variables:
@@ -176,7 +184,7 @@ ubu-gm-examples-builtin:
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
ubu-gm-examples-gmg4-builtin:
- <<: *ubuntu-job
+ <<: *ubuntu-job-registry
<<: *geomodel-job
stage: step-A
variables:
@@ -185,7 +193,7 @@ ubu-gm-examples-gmg4-builtin:
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
ubu-gm-gmg4-builtin:
- <<: *ubuntu-job
+ <<: *ubuntu-job-registry
<<: *geomodel-job
stage: step-A
variables:
@@ -194,7 +202,7 @@ ubu-gm-gmg4-builtin:
CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
ubu-gm-fullsimlight-builtin:
- <<: *ubuntu-job
+ <<: *ubuntu-job-registry
<<: *geomodel-job
stage: step-A
variables:
--
GitLab