From 687dc05cd815b0735350d33332be7c2186ccd5ce Mon Sep 17 00:00:00 2001
From: Alexander Saprykin <osapryki@redhat.com>
Date: Wed, 9 Oct 2024 18:21:54 +0200
Subject: [PATCH] Generate XML coverage report

No-Issue
---
 .coveragerc                   |  5 -----
 .github/workflows/ci_full.yml |  9 ++++++---
 pyproject.toml                | 10 +++++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 8b6382df10..0000000000
--- a/.coveragerc
+++ /dev/null
@@ -1,5 +0,0 @@
-[run]
-data_file = /tmp/.coverage
-omit = 
-	galaxy_ng/_vendor/*
-	galaxy_ng/tests/*
diff --git a/.github/workflows/ci_full.yml b/.github/workflows/ci_full.yml
index 4f353ff996..ff0c82caa3 100644
--- a/.github/workflows/ci_full.yml
+++ b/.github/workflows/ci_full.yml
@@ -77,16 +77,19 @@ jobs:
           sudo apt install -y libsasl2-dev libldap2-dev libssl-dev gettext
 
       - name: install tox & coverage
-        run: pip3 install tox coverage
+        run: pip3 install tox coverage[toml]
 
       - name: run the unit tests
         run: tox -e py311
 
+      - name: Inject PR number into coverage.xml
+        run: sed -i '2i <!-- PR ${{ github.event.number }} -->' coverage.xml
+
       - name: upload coverage as artifact
         uses: actions/upload-artifact@v4
         with:
           name: coverage
-          path: /tmp/galaxy_ng-test-results.xml
+          path: coverage.xml
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
@@ -99,7 +102,7 @@ jobs:
         continue-on-error: true
         run: |
           curl -v --user "${{ vars.PDE_ORG_RESULTS_AGGREGATOR_UPLOAD_USER }}:${{ secrets.PDE_ORG_RESULTS_UPLOAD_PASSWORD }}" \
-            --form "xunit_xml=@coverage.xml" \
+            --form "xunit_xml=@/tmp/galaxy_ng-test-results.xml" \
             --form "component_name=hub" \
             --form "git_commit_sha=${{ github.sha }}" \
             --form "git_repository_url=https://github.com/${{ github.repository }}" \
diff --git a/pyproject.toml b/pyproject.toml
index ff5f3c5042..6ba541980a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -137,9 +137,17 @@ legacy_tox_ini = """
                 --capture=no -v \
                 -p 'no:pulpcore' \
                 -p 'no:pulp_ansible' \
-                --cov-report term-missing:skip-covered \
+                --cov-report xml:coverage.xml \
                 --cov=galaxy_ng \
                 --junit-xml=/tmp/galaxy_ng-test-results.xml \
                 --pyargs "galaxy_ng.tests.unit" \
         '
 """
+
+[tool.coverage.run]
+relative_files = true
+data_file = "/tmp/.coverage"
+omit = [
+	"galaxy_ng/_vendor/*",
+	"galaxy_ng/tests/*",
+]