diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d7bd510aed26ddd422ac228e8f5093c0c481341..ba7898d89434dbd0ca93c6dfe4dc6ef74209d575 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 3f1006eb595320d73746e76bc63f431a262d829e..f60cd72261aafdb06567fca7e78a79cdee041964 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