From 9ccd8a441c3c5f3ddf75831a91eae6297bba10dd Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Wed, 11 Oct 2017 11:23:31 +0200
Subject: [PATCH] ready for MR, remove reference to this branch issue53/fix-ci

---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06b0eed10..6da59fe83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build_starpu_mpi:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_USE_MPI=ON -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON
-    - make -j4 | tee ../chameleon-build-starpu.log
+    - make -j2 | tee ../chameleon-build-starpu.log
     - make install | tee -a ../chameleon-build-starpu.log && rm install/ -r
 
 build_starpu_cuda:
@@ -37,7 +37,7 @@ build_starpu_cuda:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON
-    - make -j4 | tee ../chameleon-build-starpu-cuda.log
+    - make -j2 | tee ../chameleon-build-starpu-cuda.log
     - make install | tee -a ../chameleon-build-starpu-cuda.log && rm install/ -r
 
 build_starpu_simgrid:
@@ -54,7 +54,7 @@ build_starpu_simgrid:
     - mkdir -p build
     - cd build
     - cmake .. -DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON
-    - make -j4 | tee ../chameleon-build-starpu-simgrid.log
+    - make -j2 | tee ../chameleon-build-starpu-simgrid.log
     - make install | tee -a ../chameleon-build-starpu-simgrid.log && rm install/ -r
 
 build_quark:
@@ -71,7 +71,7 @@ build_quark:
     - mkdir -p build
     - cd build
     - cmake .. -DCMAKE_INSTALL_PREFIX=${PWD}/install -DCMAKE_VERBOSE_MAKEFILE=ON -DMORSE_ENABLE_WARNING=ON -DMORSE_ENABLE_COVERAGE=ON -DCHAMELEON_SCHED_QUARK=ON
-    - make -j4 | tee ../chameleon-build-quark.log
+    - make -j2 | tee ../chameleon-build-quark.log
     - make install | tee -a ../chameleon-build-quark.log && rm install/ -r
 
 test_starpu_mpi:
@@ -145,7 +145,6 @@ sonar:
     - ./tools/analysis.sh
   only:
     - master
-    - issue53/fix-ci
 
 doc:
   stage: doc
-- 
GitLab