diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd29514..8e03903 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ run_unit_test: artifacts: when: always paths: - - ${CI_PROJECT_DIR}/timestamp.log + - ${CI_PROJECT_DIR}/timestamp - memory-report.xml - unit-test-coverage.xml @@ -52,7 +52,7 @@ run_api_test: reports: junit: ./report/tap.xml paths: - - ${CI_PROJECT_DIR}/timestamp.log + - ${CI_PROJECT_DIR}/timestamp - api-test-coverage.xml - api-test-memory-report.xml - api-test-result.log @@ -70,7 +70,7 @@ run_functional_test: reports: junit: ./report/tap.xml paths: - - ${CI_PROJECT_DIR}/timestamp.log + - ${CI_PROJECT_DIR}/timestamp - funl-test-coverage.xml - funl-test-memory-report.xml - funl-test-result.log diff --git a/gitlab-ci/functional-api-test.sh b/gitlab-ci/functional-api-test.sh index d9486d4..40d5241 100755 --- a/gitlab-ci/functional-api-test.sh +++ b/gitlab-ci/functional-api-test.sh @@ -6,9 +6,8 @@ pwd trap cleanup EXIT trap cleanup SIGINT -set -x -pwd && ls -la -date +%s > timestamp.log + +date +%s > timestamp echo "Compiling icmwp" build_icwmp diff --git a/gitlab-ci/functional-test.sh b/gitlab-ci/functional-test.sh index c65cfa6..770651b 100755 --- a/gitlab-ci/functional-test.sh +++ b/gitlab-ci/functional-test.sh @@ -8,10 +8,7 @@ pwd trap cleanup EXIT trap cleanup SIGINT -set -x -pwd && ls -la - -date +%s > timestamp.log +date +%s > timestamp echo "Compiling icmwp" build_icwmp diff --git a/gitlab-ci/unit-test.sh b/gitlab-ci/unit-test.sh index bf70b68..10d1503 100755 --- a/gitlab-ci/unit-test.sh +++ b/gitlab-ci/unit-test.sh @@ -46,10 +46,7 @@ supervisorctl status gcovr -r . 2> /dev/null #throw away stderr # Artefact -set -x -pwd && ls -la - gcovr -r . 2> /dev/null --xml -o ./unit-test-coverage.xml -date +%s > timestamp.log +date +%s > timestamp echo "Unit test PASS"