From 02a217b3c51bf46eaefdf0807549a95da7a8a6d3 Mon Sep 17 00:00:00 2001
From: Ian Mindich <imindich@google.com>
Date: Wed, 8 Jan 2025 13:00:20 -0800
Subject: [PATCH] Ensure files uploaded by each shard have unique paths, and
 use glob patterns to pick up the files when downloading.

---
 .github/actions/on_host_tests/action.yaml        | 4 ++--
 .github/actions/process_test_results/action.yaml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/on_host_tests/action.yaml b/.github/actions/on_host_tests/action.yaml
index 67cff0c03207..9412994530fd 100644
--- a/.github/actions/on_host_tests/action.yaml
+++ b/.github/actions/on_host_tests/action.yaml
@@ -74,5 +74,5 @@ runs:
       if: success() || failure()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.test_results_key }}-${{ matrix.shard }}
-        path: ${{ env.results_dir }}/*.xml
+        name: ${{ inputs.test_results_key }}
+        path: ${{ env.results_dir }}/shard_${{ matrix.shard }}/*.xml
diff --git a/.github/actions/process_test_results/action.yaml b/.github/actions/process_test_results/action.yaml
index 64b743c63527..094fd9618aa3 100644
--- a/.github/actions/process_test_results/action.yaml
+++ b/.github/actions/process_test_results/action.yaml
@@ -13,14 +13,14 @@ runs:
     - name: Download Test Results
       uses: actions/download-artifact@v4
       with:
-        name: ${{ inputs.test_results_key }}-*
-        path: results/
+        name: ${{ inputs.test_results_key }}
+        path: results/**/*
 
     - name: Test Summary action
       continue-on-error: true
       uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86
       with:
-        paths: "results/*.xml"
+        paths: "results/**/*.xml"
         output: test-report-summary.md
         show: "fail, skip"
 
@@ -53,5 +53,5 @@ runs:
         DD_ENV: ci
       run: |
         set -x
-        ./datadog-ci junit upload --service ${DD_SERVICE} results/*.xml
+        ./datadog-ci junit upload --service ${DD_SERVICE} results/**/*.xml
       shell: bash