Seems to ok, so move back to the final state

.gitlab-ci.yml

@@ -53,10 +53,35 @@ build_starpu:
     BUILD_OPTIONS: "-DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=ON"
     VERSION: starpu
 
+build_starpu_simgrid:
+  <<: *build_script
+  artifacts:
+    name: build_starpu_simgrid
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_starpu_simgrid.log
+  variables:
+    SIMU: simu
+    BUILD_OPTIONS: "-DCHAMELEON_SIMULATION=ON -DCHAMELEON_USE_CUDA=ON -DCHAMELEON_USE_MPI=OFF"
+    VERSION: starpu_simgrid
+
+build_quark:
+  <<: *build_script
+  artifacts:
+    name: build_quark
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_quark.log
+  variables:
+    BUILD_OPTIONS: "-DCHAMELEON_SCHED_QUARK=ON"
+    VERSION: quark
+
 test_starpu_branches:
   <<: *test_script
   variables:
-    TESTS_RESTRICTION: "-R \"test_shm_|test_mpi_\""
+    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s\""
     VERSION: starpu
   dependencies:
     - build_starpu
@@ -89,10 +114,84 @@ test_starpu_master:
   only:
     - master@solverstack/chameleon
 
+test_starpu_simgrid_branches:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s\""
+    VERSION: starpu_simgrid
+  dependencies:
+    - build_starpu_simgrid
+  artifacts:
+    name: test_starpu_simgrid
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_starpu_simgrid.log
+      - chameleon_starpu_simgrid.lcov
+  only:
+    - branches
+  except:
+    - master
+
+test_starpu_simgrid_master:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"test_shm_|test_mpi_\""
+    VERSION: starpu_simgrid
+  dependencies:
+    - build_starpu_simgrid
+  artifacts:
+    name: test_starpu_simgrid
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_starpu_simgrid.log
+      - chameleon_starpu_simgrid.lcov
+  only:
+    - master@solverstack/chameleon
+
+test_quark_branches:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s\""
+    VERSION: quark
+  dependencies:
+    - build_quark
+  artifacts:
+    name: test_quark
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_quark.log
+      - chameleon_quark.lcov
+  only:
+    - branches
+  except:
+    - master
+
+test_quark_master:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"test_shm_|test_mpi_\""
+    VERSION: quark
+  dependencies:
+    - build_quark
+  artifacts:
+    name: test_quark
+    expire_in: 48 hours
+    paths:
+      - build
+      - chameleon_quark.log
+      - chameleon_quark.lcov
+  only:
+    - master@solverstack/chameleon
+
 sonar:
   stage: analysis
   dependencies:
-    - test_starpu_branches
+    - test_starpu_master
+    - test_starpu_simgrid_master
+    - test_quark_master
   artifacts:
     name: chameleon_analysis
     expire_in: 1 week
@@ -105,9 +204,13 @@ sonar:
   script:
     - cat *.log > chameleon_build.log
     - lcov -a $PWD/chameleon_starpu.lcov
+           -a $PWD/chameleon_starpu_simgrid.lcov
+           -a $PWD/chameleon_quark.lcov
            -o $PWD/chameleon.lcov
     - lcov_cobertura.py chameleon.lcov --output chameleon_coverage.xml
     - ./tools/analysis.sh
+  only:
+    - master@solverstack/chameleon
 
 doc:
   stage: doc

tools/analysis.sh

@@ -39,7 +39,7 @@ sonar.sourceEncoding=UTF-8
 sonar.c.compiler.charset=UTF-8
 sonar.c.compiler.parser=GCC
 sonar.c.compiler.regex=^(.*):(\\d+):\\d+: warning: (.*)\\[(.*)\\]$
-sonar.c.compiler.reportPath=chameleon_starpu.log
+sonar.c.compiler.reportPath=chameleon_starpu.log, chameleon_starpu_simgrid.log, chameleon_quark.log
 sonar.c.coverage.reportPath=chameleon_coverage.xml
 sonar.c.cppcheck.reportPath=chameleon_cppcheck.xml
 sonar.c.rats.reportPath=chameleon_rats.xml