From a397db1fda645dbd82293d427e80506bee41ad21 Mon Sep 17 00:00:00 2001
From: Alan Jowett <alan.jowett@microsoft.com>
Date: Sun, 14 Apr 2024 19:08:16 -0700
Subject: [PATCH 1/2] Swithc to merged netperf logs

Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
---
 .github/workflows/cicd.yml    |  6 +++---
 .github/workflows/netperf.yml | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 83cfa7f203..99d7b624ec 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -625,7 +625,7 @@ jobs:
     uses: ./.github/workflows/upload-perf-results.yml
     with:
       name: upload_netperf_results_azure_2022
-      result_artifact: bpf_performance_native_azure_2022_x64
+      result_artifact: netperf_azure_2022_x64
       platform: Azure Windows 2022
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -638,7 +638,7 @@ jobs:
     uses: ./.github/workflows/upload-perf-results.yml
     with:
       name: upload_netperf_results_azure_2025
-      result_artifact: bpf_performance_native_azure_2025_x64
+      result_artifact: Test-Logs-netperf_azure_2025_x64
       platform: Azure Windows 2025
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -651,7 +651,7 @@ jobs:
     uses: ./.github/workflows/upload-perf-results.yml
     with:
       name: upload_netperf_results_lab_2022
-      result_artifact: bpf_performance_native_lab_2022_x64
+      result_artifact: Test-Logs-netperf_lab_2022_x64
       platform: Lab Windows 2022
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
diff --git a/.github/workflows/netperf.yml b/.github/workflows/netperf.yml
index 3d850df03c..a5e4084eee 100644
--- a/.github/workflows/netperf.yml
+++ b/.github/workflows/netperf.yml
@@ -45,22 +45,22 @@ jobs:
           }
           $run_id = iex "& { $(irm $url) } ${{ secrets.NET_PERF_TRIGGER }} ebpf ${{ inputs.sha }} ${{ inputs.ref }} ${{ inputs.pull_request.number }}"
           echo "NetPerf run id: $run_id"
-          gh run download $run_id --dir netperf --pattern bpf_performance_native* --repo microsoft/netperf
+          gh run download $run_id --dir netperf --pattern ebpf* --repo microsoft/netperf
 
       - name: upload_results_azure_2022_x64
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-            name: Test-Logs-bpf_performance_native_azure_2022_x64
-            path: netperf/bpf_performance_native_azure_2022_x64/bpf_performance_native.csv
+            name: Test-Logs-netperf_azure_2022_x64
+            path: netperf/ebpf_azure_2022_x64/ebpf.csv
 
       - name: upload_results_azure_2025_x64
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-            name: Test-Logs-bpf_performance_native_azure_2025_x64
-            path: netperf/bpf_performance_native_azure_2025_x64/bpf_performance_native.csv
+            name: Test-Logs-netperf_azure_2025_x64
+            path: netperf/ebpf_azure_2025_x64/ebpf.csv
 
       - name: upload_results_lab_2022_x64
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-            name: Test-Logs-bpf_performance_native_lab_2022_x64
-            path: netperf/bpf_performance_native_lab_2022_x64/bpf_performance_native.csv
+            name: Test-Logs-netperf_lab_2022_x64
+            path: netperf/ebpf_lab_2022_x64/ebpf.csv
\ No newline at end of file

From aaede1fd283caff5af34a981dc34fe6f0d9cf785 Mon Sep 17 00:00:00 2001
From: Alan Jowett <alan.jowett@microsoft.com>
Date: Mon, 15 Apr 2024 12:15:18 -0700
Subject: [PATCH 2/2] Fix artifact path

Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
---
 .github/workflows/cicd.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 99d7b624ec..12c4ae65e3 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -638,7 +638,7 @@ jobs:
     uses: ./.github/workflows/upload-perf-results.yml
     with:
       name: upload_netperf_results_azure_2025
-      result_artifact: Test-Logs-netperf_azure_2025_x64
+      result_artifact: netperf_azure_2025_x64
       platform: Azure Windows 2025
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -651,7 +651,7 @@ jobs:
     uses: ./.github/workflows/upload-perf-results.yml
     with:
       name: upload_netperf_results_lab_2022
-      result_artifact: Test-Logs-netperf_lab_2022_x64
+      result_artifact: netperf_lab_2022_x64
       platform: Lab Windows 2022
     secrets:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}