From c28926d36308bc456b55fff2eed191271081db00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franck=20P=C3=A9rignon?= <franck.perignon@imag.fr>
Date: Fri, 20 May 2016 12:03:55 +0200
Subject: [PATCH] update CI. Run all tests
---
.gitlab-ci.yml | 41 +++--------------------------------------
ci/run_tests.sh | 2 +-
2 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d7bd510a..ba7898d89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,29 +16,14 @@ config:debian:
build:debian:
image: fperignon/hysop:debian
stage: build
- script:
- - cd build
- - make
- - make install
- - cd ..
- - python -c 'import hysop'
- - cd build
- - echo $'y\n'|make uninstall
- - make clean
+ script: "sh ci/build_install_clean.sh"
dependencies:
- config:debian
- artifacts:
- paths:
- - build/
test:debian:
image: fperignon/hysop:debian
stage: test
- script:
- - cd build
- - make
- - ctest -VV -I 2,2
- #- make test
+ script: "sh ci/run_tests.sh"
dependencies:
- build:debian
@@ -53,35 +38,15 @@ config:ubuntu:
build:ubuntu:
image: fperignon/hysop:ubuntu
stage: build
- script:
- - cd build
- - make
- - make install
- - cd ..
- - python -c 'import hysop'
- - cd build
- - echo $'y\n'|make uninstall
- - make clean
- - cd ..
- - rm -rf build
+ script: "sh ci/build_install_clean.sh"
dependencies:
- config:ubuntu
- #artifacts:
- # paths:
- # - build/
test:ubuntu:
image: fperignon/hysop:ubuntu
stage: test
script:
- #- cd build
- #- chmod -R 777 .
- useradd "hysoprunner"
- su "hysoprunner" -c "sh ci/run_tests.sh"
- #- su "hysoprunner" -c "ctest -VV -I 1,4"
- #- make test
dependencies:
- build:ubuntu
- #artifacts:
- # paths:
- # - build/
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 3f1006eb5..f60cd7226 100644
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -4,4 +4,4 @@ cd build
export FC=mpif90 CC=mpicc CXX=mpic++
cmake -D CMAKE_BUILD_TYPE=Debug -DWITH_LIB_CXX=OFF ..
make
-ctest -VV -I 1,4
+make test
--
GitLab