From 90398903ab6b8a2f653f456be77864f5d46805b4 Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Fri, 14 Jun 2024 19:03:43 +0300
Subject: [PATCH] Fix core api tests results path and artifacts naming pattern
 (#48490)

* Fix api tests results path

* Add changelog

* Run Core API tests - HPOS disabled on pull_request

* Update the artifacts name pattern to avoid conflicts

* Revert pull_request trigger
---
 .github/workflows/ci.yml                                      | 4 ++--
 .../changelog/tests-fix-core-api-tests-results-path           | 4 ++++
 plugins/woocommerce/package.json                              | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/tests-fix-core-api-tests-results-path

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c36d0481f3b..6864f40ad76 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -176,7 +176,7 @@ jobs:
               if: ${{ always() && matrix.report.resultsPath != '' }}
               uses: actions/upload-artifact@v4
               with:
-                name: '${{ matrix.report.resultsBlobName }}-${{ strategy.job-index }}'
+                name: '${{ matrix.report.resultsBlobName }}__${{ strategy.job-index }}'
                 path: ${{ env.ARTIFACTS_PATH }}
                 
             - name: 'Upload flaky test reports'
@@ -295,7 +295,7 @@ jobs:
               continue-on-error: true
               with:
                 name: ${{ matrix.report }}
-                pattern: ${{ matrix.report }}-*
+                pattern: ${{ matrix.report }}__*
                 delete-merged: true
 
             - name: 'Download merged artifacts'
diff --git a/plugins/woocommerce/changelog/tests-fix-core-api-tests-results-path b/plugins/woocommerce/changelog/tests-fix-core-api-tests-results-path
new file mode 100644
index 00000000000..1566c814915
--- /dev/null
+++ b/plugins/woocommerce/changelog/tests-fix-core-api-tests-results-path
@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Fix path to test results for api core tests
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index eed928074ea..991dcfb1cb1 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -511,7 +511,7 @@
 					},
 					"report": {
 						"resultsBlobName": "core-api-report-hpos-disabled",
-						"resultsPath": "tests/e2e-pw/test-results",
+						"resultsPath": "tests/api-core-tests/test-results",
 						"allure": true
 					}
 				},