Switch to merged netperf logs (microsoft#3452)

* Swithc to merged netperf logs Signed-off-by: Alan Jowett <[email protected]> * Fix artifact path Signed-off-by: Alan Jowett <[email protected]> --------- Signed-off-by: Alan Jowett <[email protected]> Co-authored-by: Alan Jowett <[email protected]>
gtrevi · Apr 15, 2024 · c4b7fe4 · c4b7fe4
1 parent 24f8c77
commit c4b7fe4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git 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: 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: 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
@@ -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