Merge branch 'set-new-ci-vm' into 'master'

Load the environment from a shell script to facilitate CI machines setup

See merge request !59

.gitlab-ci-env.sh

+#!/bin/bash
+
+# custom environment used during CI tests with gitlab ci
+
+# these paths may depend on the runner used, please be careful and add
+# the necessary if blocks depending on the machine
+
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+export PATH=/builds/sonar/lcov-to-cobertura-xml-1.6/lcov_cobertura:$PATH
+export PATH=/builds/sonar/sonar-scanner-2.9.0.670/bin:$PATH
+
+export QUARK_DIR=/builds/install/quark
+export PARSEC_DIR=/builds/install/parsec
+export STARPU_DIR=/builds/install/starpu
+
+if [ "$1" == "simu" ]; then
+  export STARPU_DIR=/builds/install/starpu-simgrid
+  export SIMGRID_DIR=/builds/install/simgrid
+fi
+
+export PKG_CONFIG_PATH=$PARSEC_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
+export PKG_CONFIG_PATH=$STARPU_DIR/lib/pkgconfig:$PKG_CONFIG_PATH

.gitlab-ci.yml

 starpu:
   script:
-    - git submodule init
-    - git submodule update
-    - mkdir build
+    - source .gitlab-ci-env.sh
+    - git submodule update --init --recursive
+    - mkdir -p build
     - cd build
     - cmake ..
     - make -j2
@@ -13,22 +13,20 @@ starpu:
 
 starpu-simgrid:
   script:
-    - git submodule init
-    - git submodule update
-    - mkdir build
+    - source .gitlab-ci-env.sh simu
+    - git submodule update --init --recursive
+    - mkdir -p build
     - cd build
-    - . $HOME/spack/share/spack/setup-env.sh
-    - spack load hwloc && spack load fxt && spack load simgrid && spack load starpu
     - cmake .. -DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF
     - make -j2
     - ctest -V
 
 quark:
   script:
-    - git submodule init
-    - git submodule update
-    - mkdir build
+    - source .gitlab-ci-env.sh
+    - git submodule update --init --recursive
+    - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_SCHED_QUARK=ON
     - make -j2
-    - ctest -V -R test_shm_s
\ No newline at end of file
+    - ctest -V -R test_shm_s