diff --git a/.dockerignore b/.dockerignore index 5b164b71fb..f574ee5d84 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ .dockerignore Dockerfile .vagrant/ -codecov/ +codecov-results/ .dev/ .venv/ .git/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1699261dbc..b40928595a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,22 +32,20 @@ jobs: if: ${{ !cancelled() }} uses: codecov/test-results-action@v1 with: - files: ./codecov/junit.xml + files: ./codecov-results/junit.xml flags: unittests token: ${{ secrets.CODECOV_TOKEN }} - name: Upload unit test coverage results to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 if: ${{ !cancelled() }} with: - files: ./codecov/unittests.xml + files: ./codecov-results/unittests.xml flags: unittests - token: ${{ secrets.CODECOV_TOKEN }} - name: Upload functional test coverage results to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 if: ${{ !cancelled() }} with: - files: ./codecov/functionaltests.xml + files: ./codecov-results/functionaltests.xml flags: functionaltests - token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index 436dd0ad04..8db56f9fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,6 @@ cache/ lib/ log/ .vagrant/ -codecov/ +codecov-results/ .dev/ test_logs/ diff --git a/docker/_cms-test-internal.sh b/docker/_cms-test-internal.sh index 6608e5ef47..aa508743a0 100755 --- a/docker/_cms-test-internal.sh +++ b/docker/_cms-test-internal.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash -sudo chown cmsuser:cmsuser ./codecov +sudo chown cmsuser:cmsuser ./codecov-results dropdb --if-exists --host=testdb --username=postgres cmsdbfortesting createdb --host=testdb --username=postgres cmsdbfortesting cmsInitDB -pytest --cov . --cov-report xml:codecov/unittests.xml --junitxml=codecov/junit.xml -o junit_family=legacy +pytest --cov . --cov-report xml:codecov-results/unittests.xml --junitxml=codecov-results/junit.xml -o junit_family=legacy UNIT=$? dropdb --host=testdb --username=postgres cmsdbfortesting createdb --host=testdb --username=postgres cmsdbfortesting cmsInitDB -cmsRunFunctionalTests -v --coverage codecov/functionaltests.xml +cmsRunFunctionalTests -v --coverage codecov-results/functionaltests.xml FUNC=$? # This check is needed because otherwise failing unit tests aren't reported in diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml index 72048c2410..e8d31bca48 100644 --- a/docker/docker-compose.test.yml +++ b/docker/docker-compose.test.yml @@ -15,7 +15,7 @@ services: # - https://github.com/actions/runner/issues/241 PYTEST_ADDOPTS: --color=yes volumes: - - "../codecov:/home/cmsuser/src/codecov" + - "../codecov-results:/home/cmsuser/src/codecov-results" privileged: true cgroup: host command: wait-for-it testdb:5432 -- docker/_cms-test-internal.sh