diff --git a/Makefile b/Makefile index defe0a8733d..63b65dd153c 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,6 @@ phpunit-ci-run: -c tests/phpunit/phpunit.xml \ --log-junit /tmp/results/phpunit_tests_results.xml \ --coverage-html=/tmp/results/coverage/ \ - --coverage-clover=/tmp/results/coverage/clover.xml \ --random-order \ --do-not-cache-result diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile index d84faa03599..d23661a7526 100644 --- a/tests/Jenkinsfile +++ b/tests/Jenkinsfile @@ -50,11 +50,6 @@ pipeline { stages { stage('UT PHPUnit PHP 7.3') { steps { script { actions.runPHPUnitTests('73') } } - post { - always { - step([$class: 'CloverPublisher', cloverReportDir: 'results/ut-phpunit/php-73/coverage/', cloverReportFileName: 'clover.xml']) - } - } } } post { always { junit 'results/ut-phpunit/*/phpunit_tests_results.xml' } } @@ -71,7 +66,7 @@ pipeline { post { always { junit 'results/jest/test-*-results.xml' - step([$class: 'CloverPublisher', cloverReportDir: 'results/jest/coverage/', cloverReportFileName: 'clover.xml']) + publishCoverage adapters: [istanbulCoberturaAdapter('results/jest/coverage/cobertura-coverage.xml')], tag: 'Javascript' } } } diff --git a/tests/Jenkinsfile-nightly b/tests/Jenkinsfile-nightly index cf27ca1fd6b..3972da197f1 100644 --- a/tests/Jenkinsfile-nightly +++ b/tests/Jenkinsfile-nightly @@ -36,7 +36,6 @@ pipeline { post { always { junit 'results/ut-phpunit/*/phpunit_tests_results.xml' - step([$class: 'CloverPublisher', cloverReportDir: 'results/ut-phpunit/php-74/coverage/', cloverReportFileName: 'clover.xml']) } } } diff --git a/tests/actions.groovy b/tests/actions.groovy index 22fce47b561..0ba69fef9bd 100644 --- a/tests/actions.groovy +++ b/tests/actions.groovy @@ -30,7 +30,7 @@ def runJestTests(String name, String path) { export JEST_JUNIT_OUTPUT_DIR="\$WORKSPACE/results/jest/" export JEST_JUNIT_OUTPUT_NAME="test-${name}-results.xml" export JEST_SUITE_NAME="Jest ${name} test suite" - npm --prefix "sources/" test -- '${path}' --ci --maxWorkers=2 --reporters=default --reporters=jest-junit --coverage --coverageDirectory="\$WORKSPACE/results/jest/coverage/" + npm --prefix "sources/" test -- '${path}' --ci --maxWorkers=2 --reporters=default --reporters=jest-junit --coverage --coverageReporters=text-summary --coverageReporters=cobertura --coverageDirectory="\$WORKSPACE/results/jest/coverage/" """ }