diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e673ae450a9436ca561f49e36e8e7e82283abc2..c5d7169e1ea44d2a47ea4559ddcadf68aba79234 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,21 +15,21 @@ variables: run_compile_test: stage: compile_test - image: iopsys/code-analysis + image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.27 allow_failure: false script: - "./gitlab-ci/install-dependencies.sh" - "./gitlab-ci/compile-warns.sh" - artifacts: when: always paths: - functional-test-coverage.xml - - timestamp.log + - timestamp - coverage.tar.gz + #run_functional_test: # stage: functional_test -# image: iopsys/code-analysis-dev +# image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.27 # allow_failure: false # script: # - "./gitlab-ci/install-dependencies.sh" @@ -40,12 +40,12 @@ run_compile_test: # when: always # paths: # - functional-test-coverage.xml -# - timestamp.log +# - timestamp # - coverage.tar.gz #run_checkpatch: # stage: checkpatch -# image: iopsys/code-analysis-dev +# image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.27 # allow_failure: false # script: # - "./gitlab-ci/coding-style.sh" @@ -54,5 +54,5 @@ run_compile_test: # when: always # paths: # - functional-test-coverage.xml -# - timestamp.log +# - timestamp # - coverage.tar.gz 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}"