From 83cb6d92fa41024d520a6418ac99239974836fa6 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Fri, 9 Feb 2018 13:29:49 +0100
Subject: [PATCH] Test in a branch

---
 .gitlab-ci.yml    | 80 +----------------------------------------------
 tools/analysis.sh |  2 +-
 2 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a3736a31..9334785f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ build_quark:
 test_starpu_branches:
   <<: *test_script
   variables:
-    TESTS_RESTRICTION: "-R \"test_shm_s|test_mpi_s\""
+    TESTS_RESTRICTION: "-R \"test_shm_|test_mpi_\""
     VERSION: starpu
   dependencies:
     - build_starpu
@@ -114,84 +114,10 @@ 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_master
-    - test_starpu_simgrid_master
-    - test_quark_master
   artifacts:
     name: chameleon_analysis
     expire_in: 1 week
@@ -204,13 +130,9 @@ 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
diff --git a/tools/analysis.sh b/tools/analysis.sh
index 4635d4d59..6c5b7f64e 100755
--- a/tools/analysis.sh
+++ b/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, chameleon_starpu_simgrid.log, chameleon_quark.log
+sonar.c.compiler.reportPath=chameleon_starpu.log
 sonar.c.coverage.reportPath=chameleon_coverage.xml
 sonar.c.cppcheck.reportPath=chameleon_cppcheck.xml
 sonar.c.rats.reportPath=chameleon_rats.xml
-- 
GitLab