From 9b6bc04e96d2658c608655cddf5277dfd9db3561 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 16 Mar 2016 12:39:12 +0000
Subject: [PATCH] Add stated to builds

---
 .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh | 18 +++++-----
 .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh    | 17 +++++-----
 .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh    | 17 +++++-----
 .gitlab-ci.yml                                | 33 ++++++++++++-------
 4 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
index 444325d0b..62befbb36 100644
--- a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
@@ -13,14 +13,14 @@ source $LCGRELEASES/gcc/4.9.3/x86_64-centos7/setup.sh
 #     CMake 3.4.1
 #--------------------------------------------------------------------------------
 
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-centos7-gcc49-opt/
+export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-centos7-gcc49-opt
 export PATH=${CMAKE_HOME}/bin:$PATH
 
 #--------------------------------------------------------------------------------
 #     Python 2.7.10
 #--------------------------------------------------------------------------------
 
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-centos7-gcc49-opt/
+export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-centos7-gcc49-opt
 export PATH=$PYTHONDIR/bin:$PATH
 export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 #     pytools 1.9
 #--------------------------------------------------------------------------------
 
-export PYTOOLSDIR=$LCGRELEASES/1.9_python2.7/x86_64-centos7-gcc49-opt/
+export PYTOOLSDIR=$LCGRELEASES/1.9_python2.7/x86_64-centos7-gcc49-opt
 export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
 export PATH=$PYTOOLSDIR/bin:$PATH
 
@@ -36,7 +36,7 @@ export PATH=$PYTOOLSDIR/bin:$PATH
 #     CLHEP
 #--------------------------------------------------------------------------------
 
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-centos7-gcc49-opt/
+export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-centos7-gcc49-opt
 export CLHEP_BASE_DIR="$CLHEP"
 export CLHEP_INCLUDE_DIR="$CLHEP/include"
 export PATH="$CLHEP_BASE_DIR/bin:$PATH"
@@ -46,7 +46,7 @@ export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
 #     ROOT
 #--------------------------------------------------------------------------------
 
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-centos7-gcc49-opt/
+export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-centos7-gcc49-opt
 export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
 export PATH="$ROOTSYS/bin:$PATH"
 export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
@@ -64,7 +64,7 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 #     Geant4	
 #--------------------------------------------------------------------------------
 
-export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-centos7-gcc49-opt/
+export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-centos7-gcc49-opt
 export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
 export G4SYSTEM="Linux-g++"
 
@@ -72,7 +72,7 @@ export G4SYSTEM="Linux-g++"
 #     QT
 #--------------------------------------------------------------------------------
 
-export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-centos7-gcc49-opt/
+export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-centos7-gcc49-opt
 export QMAKESPEC="$QTDIR/mkspecs/linux-g++"
 export PATH="$QTDIR/bin:$PATH"
 export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
@@ -81,12 +81,12 @@ export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
 #     Boost
 #--------------------------------------------------------------------------------
 
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-centos7-gcc49-opt/
+export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-centos7-gcc49-opt
 
 #--------------------------------------------------------------------------------
 #     XercesC
 #--------------------------------------------------------------------------------
 
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-centos7-gcc49-opt/
+export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-centos7-gcc49-opt
 export PATH="$XercesC_HOME/bin:$PATH"
 export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
index 43671a3f5..e612bcb58 100644
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
@@ -13,14 +13,14 @@ source $LCGRELEASES/gcc/4.8.4/x86_64-slc6/setup.sh
 #     CMake 3.4.1
 #--------------------------------------------------------------------------------
 
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc48-opt/
+export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc48-opt
 export PATH=${CMAKE_HOME}/bin:$PATH
 
 #--------------------------------------------------------------------------------
 #     Python 2.7.10
 #--------------------------------------------------------------------------------
 
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc48-opt/
+export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc48-opt
 export PATH=$PYTHONDIR/bin:$PATH
 export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 #     pytools 1.9
 #--------------------------------------------------------------------------------
 
-export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc48-opt/
+export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc48-opt
 export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
 export PATH=$PYTOOLSDIR/bin:$PATH
 
@@ -36,7 +36,7 @@ export PATH=$PYTOOLSDIR/bin:$PATH
 #     CLHEP
 #--------------------------------------------------------------------------------
 
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc48-opt/
+export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc48-opt
 export CLHEP_BASE_DIR="$CLHEP"
 export CLHEP_INCLUDE_DIR="$CLHEP/include"
 export PATH="$CLHEP_BASE_DIR/bin:$PATH"
@@ -46,7 +46,7 @@ export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
 #     ROOT
 #--------------------------------------------------------------------------------
 
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc48-opt/
+export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc48-opt
 export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
 export PATH="$ROOTSYS/bin:$PATH"
 export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
@@ -63,8 +63,7 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 #     Geant4	
 #--------------------------------------------------------------------------------
 
-#export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc48-opt/
-export G4INSTALL="/cvmfs/sft.cern.ch/lcg/releases/Geant4/10.02-7c0e3/x86_64-slc6-gcc48-opt/"
+export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-slc6-gcc48-opt
 export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
 export G4SYSTEM="Linux-g++"
 
@@ -81,13 +80,13 @@ export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
 #     Boost
 #--------------------------------------------------------------------------------
 
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc48-opt/
+export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc48-opt
 
 #--------------------------------------------------------------------------------
 #     XercesC
 #--------------------------------------------------------------------------------
 
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc48-opt/
+export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc48-opt
 export PATH="$XercesC_HOME/bin:$PATH"
 export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
 
diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
index d15383b2e..0dfe42ed1 100644
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
@@ -13,14 +13,14 @@ source $LCGRELEASES/gcc/4.9.3/x86_64-slc6/setup.sh
 #     CMake 3.4.1
 #--------------------------------------------------------------------------------
 
-export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc49-opt/
+export CMAKE_HOME=$LCGRELEASES/CMake/3.4.1/x86_64-slc6-gcc49-opt
 export PATH=${CMAKE_HOME}/bin:$PATH
 
 #--------------------------------------------------------------------------------
 #     Python 2.7.10
 #--------------------------------------------------------------------------------
 
-export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc49-opt/
+export PYTHONDIR=$LCGRELEASES/Python/2.7.10/x86_64-slc6-gcc49-opt
 export PATH=$PYTHONDIR/bin:$PATH
 export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 
@@ -28,7 +28,7 @@ export LD_LIBRARY_PATH=$PYTHONDIR/lib:$LD_LIBRARY_PATH
 #     pytools 1.9
 #--------------------------------------------------------------------------------
 
-export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc49-opt/
+export PYTOOLSDIR=$LCGRELEASES/pytools/1.9_python2.7/x86_64-slc6-gcc49-opt
 export PYTHONPATH=$PYTOOLSDIR/lib/python2.7/site-packages:$PYTHONPATH
 export PATH=$PYTOOLSDIR/bin:$PATH
 
@@ -36,7 +36,7 @@ export PATH=$PYTOOLSDIR/bin:$PATH
 #     CLHEP
 #--------------------------------------------------------------------------------
 
-export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc49-opt/
+export CLHEP=$LCGRELEASES/clhep/2.3.1.1/x86_64-slc6-gcc49-opt
 export CLHEP_BASE_DIR="$CLHEP"
 export CLHEP_INCLUDE_DIR="$CLHEP/include"
 export PATH="$CLHEP_BASE_DIR/bin:$PATH"
@@ -46,7 +46,7 @@ export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
 #     ROOT
 #--------------------------------------------------------------------------------
 
-export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc49-opt/
+export ROOTSYS=$LCGRELEASES/ROOT/6.06.02/x86_64-slc6-gcc49-opt
 export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
 export PATH="$ROOTSYS/bin:$PATH"
 export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
@@ -64,8 +64,7 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 #     Geant4	
 #--------------------------------------------------------------------------------
 
-#export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc49-opt/
-export G4INSTALL="/cvmfs/sft.cern.ch/lcg/releases/Geant4/10.02-7c0e3/x86_64-slc6-gcc49-opt/"
+export G4INSTALL=$LCGRELEASES/../Geant4/10.02-7c0e3/x86_64-slc6-gcc49-opt
 export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
 export G4SYSTEM="Linux-g++"
 
@@ -82,13 +81,13 @@ export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
 #     Boost
 #--------------------------------------------------------------------------------
 
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc49-opt/
+export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-slc6-gcc49-opt
 
 #--------------------------------------------------------------------------------
 #     XercesC
 #--------------------------------------------------------------------------------
 
-export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc49-opt/
+export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-slc6-gcc49-opt
 export PATH="$XercesC_HOME/bin:$PATH"
 export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50b354618..dfb20934e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,39 @@
 before_script:
     #pre-installation script
-    - yum install make glibc-devel openmotif-devel mesa-libGLU-devel expat-devel -y
+    - yum install which make glibc-devel openmotif-devel mesa-libGLU-devel expat-devel -y
 
-slc6-gcc48:
+stages:
+    - configure
+    - build
+    - test
+    - example_configure
+    - example_build
+    - example_test
+
+slc6-gcc48_configure:
   tags:
     - docker
   image: cern/slc6-base
+  stage: configure
   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 install
-
-
-slc6-gcc49:
+    
+slc6-gcc48_build:
   tags:
     - docker
   image: cern/slc6-base
+  stage: build
   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 install
+    
+slc6-gcc48_test:
+  tags:
+    - docker
+  image: cern/slc6-base
+  stage: test
+  script:
+    - make test
-- 
GitLab