From e52cf01f588316d8905581544c6d0272907a95e1 Mon Sep 17 00:00:00 2001
From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com>
Date: Wed, 14 May 2025 15:37:21 -0400
Subject: [PATCH 1/5] test windows against common server IO

---
 .github/workflows/quic.yml         |  9 +++++----
 .github/workflows/quic_matrix.json | 11 ++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml
index 0271807e..bdbd8a4c 100644
--- a/.github/workflows/quic.yml
+++ b/.github/workflows/quic.yml
@@ -322,25 +322,26 @@ jobs:
           -arch ${{ matrix.arch }} `
           -tls ${{ matrix.tls }} `
           -io ${{ matrix.io }} `
+          -serverio ${{ matrix.serverio }} `
           -filter '${{ github.event.client_payload.filter || inputs.filter || '' }}'
     - name: Upload Test Results JSON
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}.json
-        path: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}.json
+        name: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}.json
+        path: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}.json
     - name: Upload Logs
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: logs-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}
+        name: logs-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}
         path: artifacts/logs
         if-no-files-found: ignore
     - name: Upload Full Latency Curves
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: latency-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}
+        name: latency-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}
         path: latency.txt
         if-no-files-found: ignore
 
diff --git a/.github/workflows/quic_matrix.json b/.github/workflows/quic_matrix.json
index 185669c1..bca5b237 100644
--- a/.github/workflows/quic_matrix.json
+++ b/.github/workflows/quic_matrix.json
@@ -8,5 +8,14 @@
     { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" }
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" },
+    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp" },
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp" },
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp" }
 ]

From 7fbef77b3488438abef9e55c1f60f743bca44a46 Mon Sep 17 00:00:00 2001
From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com>
Date: Wed, 14 May 2025 15:42:11 -0400
Subject: [PATCH 2/5] do 1es, too

---
 .github/workflows/quic.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml
index bdbd8a4c..3671aa09 100644
--- a/.github/workflows/quic.yml
+++ b/.github/workflows/quic.yml
@@ -171,7 +171,7 @@ jobs:
       workflowId: ${{ github.run_id }}-${{ github.run_attempt }}
 
   run-secnetperf-1es:
-    name: ${{ matrix.optional == 'TRUE' && '[UNRELIABLE]-' || '' }}azure-${{ matrix.os }}-${{ matrix.io }}-${{ matrix.role }}-${{ matrix.tls }}-${{ matrix.arch }}
+    name: ${{ matrix.optional == 'TRUE' && '[UNRELIABLE]-' || '' }}azure-${{ matrix.os }}-${{ matrix.io }}-${{ matrix.serverio }}-${{ matrix.role }}-${{ matrix.tls }}-${{ matrix.arch }}
     needs: [prepare-matrix, build-windows, build-windows-kernel, build-unix]
     strategy:
       fail-fast: false
@@ -234,6 +234,7 @@ jobs:
           -arch ${{ matrix.arch }} `
           -tls ${{ matrix.tls }} `
           -io ${{ matrix.io }} `
+          -serverio ${{ matrix.serverio }} `
           -filter '${{ github.event.client_payload.filter || inputs.filter || '' }}'
         matrix: '${{ toJson(matrix) }}'
         syncer-secret: ${{ secrets.NETPERF_SYNCER_SECRET }}
@@ -247,20 +248,20 @@ jobs:
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}.json
-        path: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}.json
+        name: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}.json
+        path: json-test-results-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}.json
     - name: Upload Logs
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: logs-${{ matrix.env }}-${{ matrix.role }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}
+        name: logs-${{ matrix.env }}-${{ matrix.role }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}
         path: artifacts/logs
         if-no-files-found: ignore
     - name: Upload Full Latency Curves
       if: ${{ always() }}
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
-        name: latency-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}
+        name: latency-${{ matrix.env }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-${{ matrix.io }}-${{ matrix.serverio }}
         path: latency.txt
         if-no-files-found: ignore
 
@@ -269,7 +270,7 @@ jobs:
   # NOTE: tag == env
   #
   run-secnetperf:
-    name:  ${{ matrix.optional == 'TRUE' && '[UNRELIABLE]-' || '' }}lab-${{ matrix.os }}-${{ matrix.io }}-${{ matrix.tls }}-${{ matrix.arch }}
+    name:  ${{ matrix.optional == 'TRUE' && '[UNRELIABLE]-' || '' }}lab-${{ matrix.os }}-${{ matrix.io }}-${{ matrix.serverio }}-${{ matrix.tls }}-${{ matrix.arch }}
     needs: [prepare-matrix, build-windows, build-windows-kernel, build-unix]
     strategy:
       fail-fast: false

From 944d2654aa9e307c3595c7b2fbe8206708b40804 Mon Sep 17 00:00:00 2001
From: Michael Friesen <3517159+mtfriesen@users.noreply.github.com>
Date: Wed, 14 May 2025 16:40:00 -0400
Subject: [PATCH 3/5] yml

---
 .github/workflows/quic.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/quic.yml b/.github/workflows/quic.yml
index 3671aa09..ef51bfcd 100644
--- a/.github/workflows/quic.yml
+++ b/.github/workflows/quic.yml
@@ -234,7 +234,7 @@ jobs:
           -arch ${{ matrix.arch }} `
           -tls ${{ matrix.tls }} `
           -io ${{ matrix.io }} `
-          -serverio ${{ matrix.serverio }} `
+          -serverio '${{ matrix.serverio }}' `
           -filter '${{ github.event.client_payload.filter || inputs.filter || '' }}'
         matrix: '${{ toJson(matrix) }}'
         syncer-secret: ${{ secrets.NETPERF_SYNCER_SECRET }}
@@ -323,7 +323,7 @@ jobs:
           -arch ${{ matrix.arch }} `
           -tls ${{ matrix.tls }} `
           -io ${{ matrix.io }} `
-          -serverio ${{ matrix.serverio }} `
+          -serverio '${{ matrix.serverio }}' `
           -filter '${{ github.event.client_payload.filter || inputs.filter || '' }}'
     - name: Upload Test Results JSON
       if: ${{ always() }}

From d34a779fdf615ace7bb1a018824fbe45af454742 Mon Sep 17 00:00:00 2001
From: "Michael Friesen (NETWORKING)"
 <3517159+mtfriesen@users.noreply.github.com>
Date: Thu, 15 May 2025 14:43:21 -0400
Subject: [PATCH 4/5] don't onboard new matrix yet

---
 .github/workflows/quic_matrix.json | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/quic_matrix.json b/.github/workflows/quic_matrix.json
index bca5b237..185669c1 100644
--- a/.github/workflows/quic_matrix.json
+++ b/.github/workflows/quic_matrix.json
@@ -8,14 +8,5 @@
     { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "preferred_pool_sku": "Experimental_Boost4" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp" },
     { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" },
-    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "azure", "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "azure", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp", "preferred_pool_sku": "Experimental_Boost4" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "iocp", "serverio": "iocp" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "xdp", "serverio": "iocp" },
-    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk", "serverio": "iocp" }
+    { "env": "lab",   "os": "windows-2022", "arch": "x64", "tls": "schannel", "io": "wsk" }
 ]

From 7f0ff76f753fe39d03ddaa54616d1acc32fce02e Mon Sep 17 00:00:00 2001
From: "Michael Friesen (NETWORKING)"
 <3517159+mtfriesen@users.noreply.github.com>
Date: Thu, 15 May 2025 15:12:16 -0400
Subject: [PATCH 5/5] dummy commit