Run the test_suite in the test phase, and do the coverage only on fedora

This commit is contained in:
louiz’
2018-08-26 18:13:48 +02:00
parent b9f6fbd840
commit 7f50a3c3d2
+10 -12
View File
@@ -32,7 +32,6 @@ variables:
- cd build/ - cd build/
- cmake .. -DCMAKE_CXX_FLAGS="-Werror -Wno-psabi" -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3} ${POSTGRESQL} - cmake .. -DCMAKE_CXX_FLAGS="-Werror -Wno-psabi" -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3} ${POSTGRESQL}
- make everything -j$(nproc || echo 1) - make everything -j$(nproc || echo 1)
- make coverage_check -j$(nproc || echo 1)
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
paths: paths:
@@ -111,8 +110,8 @@ build:no_db_botan:
- docker - docker
script: script:
- cd build/ - cd build/
- make coverage_e2e -j$(nproc || echo 1) - make check -j$(nproc || echo 1)
- make coverage - make e2e -j$(nproc || echo 1)
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
paths: paths:
@@ -132,6 +131,11 @@ test:debian:
test:fedora: test:fedora:
image: docker.louiz.org/louiz/biboumi/test-fedora:latest image: docker.louiz.org/louiz/biboumi/test-fedora:latest
<<: *basic_test <<: *basic_test
script:
- cd build/
- make coverage_check -j$(nproc || echo 1)
- make coverage_e2e -j$(nproc || echo 1)
- make coverage
dependencies: dependencies:
- build:fedora - build:fedora
@@ -143,18 +147,12 @@ test:no_udns:
test:alpine: test:alpine:
image: docker.louiz.org/louiz/biboumi/test-alpine:latest image: docker.louiz.org/louiz/biboumi/test-alpine:latest
stage: test <<: *basic_test
tags:
- docker
script:
- cd build/
- make e2e
dependencies: dependencies:
- build:alpine - build:debian
image: docker.louiz.org/louiz/biboumi/test-alpine:latest
test:freebsd: test:freebsd:
only:
- branches@louiz/biboumi
tags: tags:
- freebsd - freebsd
variables: variables: