From 142a00d3da666de585a5275347b90c993b84c912 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 16 Mar 2016 14:19:45 +0000
Subject: [PATCH] Moved images to new dockerhub repo, to permanently add the
pre build packages
---
.gitlab-ci.yml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 493545237..fe630583a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,15 @@
-before_script:
- #pre-installation script
- - yum install which make glibc-devel openmotif-devel mesa-libGLU-devel expat-devel -y
-
slc6-gcc48:
tags:
- docker
- image: cern/slc6-base
+ image: clicdp/slc6-base
script:
- source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
- mkdir build
- cd build
- cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX11=ON ..
- make -j2
- - make test
- make install
+ - make test
- cd ../examples
- mkdir build
- cd build
@@ -25,15 +21,15 @@ slc6-gcc48:
slc6-gcc49:
tags:
- docker
- image: cern/slc6-base
+ image: clicdp/slc6-base
script:
- source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
- mkdir build
- cd build
- cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..
- make -j2
- - make test
- make install
+ - make test
- cd ../examples
- mkdir build
- cd build
@@ -46,15 +42,15 @@ slc6-gcc49:
centos7-gcc49:
tags:
- docker
- image: cern/cc7-base
+ image: clicdp/cc7-base
script:
- source .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
- mkdir build
- cd build
- cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..
- make -j2
- - make test
- make install
+ - make test
- cd ../examples
- mkdir build
- cd build
--
GitLab