From da15f2f6848f5961ad92a2a105974a178dbc9a92 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Mon, 14 Mar 2016 21:16:43 +0000
Subject: [PATCH] moved software to LCG_84 for slc6 and removed cenos7 from
 tests

---
 .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh | 20 +++++++--------
 .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh | 20 +++++++--------
 .gitlab-ci.yml                             | 30 ++--------------------
 3 files changed, 22 insertions(+), 48 deletions(-)

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 ac25922f7..567ed7ba1 100644
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
  
 # General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases
+export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
 
 #--------------------------------------------------------------------------------
 #     GCC 4.8.4
@@ -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-811c2/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.9
+#     Python 2.7.10
 #--------------------------------------------------------------------------------
 
-export PYTHONDIR=$LCGRELEASES/Python/2.7.9.p1-af54f/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-f55a5/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-6ba0c/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.04.06-458fa/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,7 +63,7 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 #     Geant4	
 #--------------------------------------------------------------------------------
 
-export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02-81fbd/x86_64-slc6-gcc48-opt/
+export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc48-opt/
 export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
 export G4SYSTEM="Linux-g++"
 
@@ -71,13 +71,13 @@ export G4SYSTEM="Linux-g++"
 #     Boost
 #--------------------------------------------------------------------------------
 
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7-71952/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-8ccd5/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 12a9e3e12..f5883e37c 100644
--- a/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
  
 # General variables
-export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/
+export LCGRELEASES=/cvmfs/sft.cern.ch/lcg/releases/LCG_84
 
 #--------------------------------------------------------------------------------
 #     GCC 4.9.3
@@ -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-811c2/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.9
+#     Python 2.7.10
 #--------------------------------------------------------------------------------
 
-export PYTHONDIR=$LCGRELEASES/Python/2.7.9.p1-af54f/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-f55a5/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-6ba0c/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.04.06-458fa/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"
@@ -63,7 +63,7 @@ export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 #     Geant4	
 #--------------------------------------------------------------------------------
 
-export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02-81fbd/x86_64-slc6-gcc49-opt/
+export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc49-opt/
 export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
 export G4SYSTEM="Linux-g++"
 
@@ -71,13 +71,13 @@ export G4SYSTEM="Linux-g++"
 #     Boost
 #--------------------------------------------------------------------------------
 
-export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7-71952/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-8ccd5/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 06bc9217a..d4da7e79f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,32 +4,6 @@ before_script:
     - yum install which -y
     - yum install glibc-devel -y
 
-centos7-gcc48:
-  tags:
-    - docker
-  image: cern/cc7-base
-  script:
-    - source .gitlab-ci.d/init_x86_64-centos7-gcc48-opt.sh
-    - mkdir build 
-    - cd build
-    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=OFF -D CLHEP_DIR=$CLHEP -D DD4HEP_USE_GEAR=0 -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
-    - make -j4
-    - make install
-
-
-centos7-gcc49:
-  tags:
-    - docker
-  image: cern/cc7-base
-  script:
-    - source .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
-    - mkdir build 
-    - cd build
-    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=OFF -D CLHEP_DIR=$CLHEP -D DD4HEP_USE_GEAR=0 -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
-    - make -j4
-    - make install
-
-
 slc6-gcc48:
   tags:
     - docker
@@ -38,7 +12,7 @@ slc6-gcc48:
     - source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
     - mkdir build 
     - cd build
-    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=OFF -D CLHEP_DIR=$CLHEP -D DD4HEP_USE_GEAR=0 -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
+    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D CLHEP_DIR=$CLHEP -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
     - make -j4
     - make install
 
@@ -51,6 +25,6 @@ slc6-gcc49:
     - source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
     - mkdir build 
     - cd build
-    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=OFF -D CLHEP_DIR=$CLHEP -D DD4HEP_USE_GEAR=0 -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
+    - cmake -D DD4HEP_USE_GEANT4=1 -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D CLHEP_DIR=$CLHEP -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_C_COMPILER=`which gcc` ..
     - make -j4
     - make install
-- 
GitLab