diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ce503ac8f58c5fd4349aed709955b12318373a0..9ddf28cace168db47165aee549baa889628b6b0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,21 +15,21 @@ variables: run_compile_test: stage: compile_test - image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:latest + image: iopsys/code-analysis allow_failure: false script: - "./gitlab-ci/install-dependencies.sh" - "./gitlab-ci/compile-warns.sh" - artifacts: when: always paths: + - ${CI_PROJECT_DIR}/ - functional-test-coverage.xml - - timestamp.log - - coverage.tar.gz + - timestamp + #run_functional_test: # stage: functional_test -# image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis +# image: iopsys/code-analysis-dev # allow_failure: false # script: # - "./gitlab-ci/install-dependencies.sh" @@ -40,12 +40,13 @@ run_compile_test: # when: always # paths: # - functional-test-coverage.xml -# - timestamp.log +# - unit-test-coverage.xml #according to ./gitlab-ci/functional-test.sh +# - timestamp # - coverage.tar.gz #run_checkpatch: # stage: checkpatch -# image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:latest +# image: iopsys/code-analysis-dev # allow_failure: false # script: # - "./gitlab-ci/coding-style.sh" diff --git a/gitlab-ci/functional-test.sh b/gitlab-ci/functional-test.sh index 0450298038fa69a8f992c5a914150702fa12822a..ffa3964d54f06dc1a6c929860579b29c3f33ea3b 100755 --- a/gitlab-ci/functional-test.sh +++ b/gitlab-ci/functional-test.sh @@ -76,6 +76,6 @@ supervisorctl status all gcovr -r . # Artefact gcovr -r . --xml -o ./unit-test-coverage.xml -date +%s > timestamp.log +date +%s > timestamp #echo "$0 Return status ${ret}"