Add merge-junit-reports sub-action

Author: Donnerbart

README.md

@@ -44,19 +44,34 @@ jobs:
         with:
           split-index: ${{ matrix.split-index }}
           split-total: ${{ env.split-total }}
-          glob: '**/helm-charts/tests-hivemq-operator/**/*IT.java'
+          glob: '**/src/integrationTest/**/*IT.java'
           junit-glob: '**/junit-reports/*.xml'
           format: 'gradle'
           averageTime: true
           debug: true
-      - name: Run HiveMQ Legacy Operator integration tests
+      - name: Run integration tests
         working-directory: helm-charts
         env:
           K8S_VERSION_TYPE: ${{ matrix.k8s-version-type }}
-        run: ./gradlew :tests-hivemq-operator:integrationTest ${{ steps.split-tests.outputs.test-suite }}        
+        run: ./gradlew :integrationTest ${{ steps.split-tests.outputs.test-suite }}        
       - name: Upload JUnit report artifact
         uses: actions/upload-artifact@v4
         with:
           name: junit-xml-reports-${{ matrix.split-index }}
           path: '**/test-results/integrationTest/*.xml'
+
+  merge-junit-reports:
+    runs-on: ubuntu-latest
+    name: "Merge JUnit reports"
+    needs:
+      - integration-test
+    permissions:
+      contents: write
+    steps:
+      - name: Merge JUnit reports
+        uses: donnerbart/split-tests-java-action/merge-junit-reports@v1
+        with:
+          git-branch: junit-reports/${{ github.base_ref }}
+          artifact-name: junit-xml-reports
+          split-artifact-pattern: junit-xml-reports-*
 ```

merge-junit-reports/action.yml

@@ -0,0 +1,80 @@
+name: Merge JUnit reports
+author: [email protected]
+description: Merges the JUnit reports from the test split jobs and saves them in a Git branch
+inputs:
+  git-branch:
+    description: The Git branch in this repository to store the JUnit reports in (string)
+    required: true
+  artifact-name:
+    description: The artifact name for the merged JUnit reports of all test split jobs
+    required: true
+  split-artifact-pattern:
+    description: The artifact name pattern used by the test split jobs, e.g. junit-xml-reports-* (string)
+    required: true
+  split-artifact-delete-merged:
+    description: Configures if the artifacts of the test split jobs should be deleted after the merge (boolean)
+    required: false
+    default: true
+  cleanup-junit-reports:
+    description: Configures if the test output should be removed from the merged JUnit reports (boolean)
+    required: false
+    default: true
+  delete-old-junit-reports:
+    description: Configures if the old JUnit reports in the Git branch should be deleted (boolean)
+    required: false
+    default: true
+runs:
+  using: composite
+  steps:
+    - name: Set up xmlstarlet
+      run: sudo apt update && sudo apt install -y xmlstarlet
+
+    - name: Checkout JUnit reports
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      with:
+        path: junit-reports
+        ref: ${{ inputs.git-branch }}
+      continue-on-error: true
+
+    - name: Merge JUnit report artifacts
+      uses: actions/upload-artifact/merge@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
+      with:
+        name: ${{ inputs.artifact-name }}
+        pattern: ${{ inputs.split-artifact-pattern }}
+        delete-merged: ${{ split-artifact-delete-merged }}
+
+    - name: Download JUnit reports artifact
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+      with:
+        name: ${{ inputs.artifact-name }}
+        path: junit-reports-artifact
+
+    - name: Clean up JUnit reports
+      if: ${{ inputs.cleanup-junit-reports }}
+      working-directory: junit-reports-artifact
+      run: |
+        echo -n "JUnit report size before cleanup: "
+        du -sch *.xml | tail -n 1 | cut -f1
+        for REPORT in *.xml; do
+          xmlstarlet ed -d '//system-out' -d '//system-err' "$REPORT" > tmp-report.xml && mv tmp-report.xml "$REPORT"
+        done
+        echo -n "JUnit report size after cleanup: "
+        du -sch *.xml | tail -n 1 | cut -f1
+
+    - name: Delete old JUnit reports
+      if: ${{ inputs.delete-old-junit-reports }}
+      working-directory: junit-reports
+      run: git rm *.xml || true
+
+    - name: Copy new JUnit reports
+      run: cp junit-reports-artifact/*.xml junit-reports/
+
+    - name: Update JUnit reports
+      uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9
+      with:
+        message: 'Update JUnit reports'
+        add: '*.xml'
+        cwd: junit-reports
+branding:
+  icon: archive
+  color: blue