Merge branch 'main' into dev/daiki/linux_xdp_docker

microsoft · Sep 23, 2023 · 7b22a27 · 7b22a27
2 parents 5be0cb2 + ae3db5c
commit 7b22a27
Show file tree

Hide file tree

Showing 75 changed files with 3,451 additions and 2,881 deletions.
diff --git a/.azure/OneBranch.Official.yml b/.azure/OneBranch.Official.yml
@@ -86,22 +86,6 @@ extends:
         parameters:
           config: Debug
 
-    - stage: build_windows_xdp
-      displayName: Build Windows XDP
-      dependsOn: []
-      jobs:
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: schannel
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: openssl
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Debug
-
     - stage: build_windows
       displayName: Build Windows
       dependsOn: []
@@ -204,7 +188,6 @@ extends:
       dependsOn:
       - build_windows
       - build_uwp
-      - build_windows_xdp
       jobs:
       - template: .azure/obtemplates/build-nuget.yml@self
         ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/') }}:

diff --git a/.azure/OneBranch.PullRequest.yml b/.azure/OneBranch.PullRequest.yml
@@ -82,22 +82,6 @@ extends:
         parameters:
           config: Debug
 
-    - stage: build_windows_xdp
-      displayName: Build Windows XDP
-      dependsOn: []
-      jobs:
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: schannel
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Release
-          tls: openssl
-      - template: .azure/obtemplates/build-winuser-xdp.yml@self
-        parameters:
-          config: Debug
-
     - stage: build_windows
       displayName: Build Windows
       dependsOn: []
@@ -198,6 +182,5 @@ extends:
       dependsOn:
       - build_windows
       - build_uwp
-      - build_windows_xdp
       jobs:
       - template: .azure/obtemplates/build-nuget.yml@self
diff --git a/.azure/azure-pipelines.perf.yml b/.azure/azure-pipelines.perf.yml
@@ -157,7 +157,7 @@ stages:
         arch: ${{ parameters.arch }}
         config: Release
 
-- ${{ if or(eq(parameters.winkernel, true), eq(parameters.winuser_schannel, true)) }}:
+- ${{ if or(eq(parameters.winkernel, true), eq(parameters.winuser_schannel, true), eq(parameters.winuser_xdp, true)) }}:
   - stage: build_winuser_schannel
     displayName: Build Windows (Schannel)
     dependsOn: []
@@ -171,33 +171,12 @@ stages:
         arch: ${{ parameters.arch }}
         tls: schannel
         config: Release
-        extraPrepareArgs: -DisableTest
+        extraPrepareArgs: -DisableTest -InstallXdpSdk
         ${{ if eq(parameters.pgo_mode, false) }}:
           extraBuildArgs: -DisableTest -DisableTools
         ${{ if eq(parameters.pgo_mode, true) }}:
           extraBuildArgs: -DisableTest -DisableTools -PGO
 
-- ${{ if eq(parameters.winuser_xdp, true) }}:
-  - stage: build_winuser_xdp
-    displayName: Build Windows (XDP)
-    dependsOn: []
-    variables:
-      runCodesignValidationInjection: false
-    jobs:
-    - template: ./templates/build-config-user.yml
-      parameters:
-        image: windows-latest
-        platform: windows
-        arch: ${{ parameters.arch }}
-        tls: schannel
-        config: Release
-        extraName: 'xdp'
-        extraPrepareArgs: -DisableTest -InstallXdpSdk
-        ${{ if eq(parameters.pgo_mode, false) }}:
-          extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp
-        ${{ if eq(parameters.pgo_mode, true) }}:
-          extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp -PGO
-
 - ${{ if eq(parameters.winuser_openssl, true) }}:
   - stage: build_winuser_openssl
     displayName: Build Windows (OpenSSL)
@@ -331,7 +310,7 @@ stages:
   - stage: perf_winuser_xdp
     displayName: Performance Testing Windows (XDP)
     dependsOn:
-    - build_winuser_xdp
+    - build_winuser_schannel
     jobs:
     - template: ./templates/run-performance.yml
       parameters:
@@ -344,11 +323,10 @@ stages:
         protocol: ${{ parameters.protocol }}
         logProfile: ${{ parameters.logging }}
         timeout: ${{ parameters.timeout }}
-        extraArtifactDir: '_Xdp'
         ${{ if eq(parameters.QTIP, true) }}:
-          extraTestArgs: -ExtraArtifactDir _Xdp -XDP -QTIP
+          extraTestArgs: -XDP -QTIP
         ${{ else }}:
-          extraTestArgs: -ExtraArtifactDir _Xdp -XDP
+          extraTestArgs: -XDP
         ${{ if ne(parameters.testToRun, 'all') }}:
           testToRun: ${{ parameters.testToRun }}
         testTypes: Remote

diff --git a/.azure/azure-pipelines.periodic.yml b/.azure/azure-pipelines.periodic.yml
@@ -34,7 +34,7 @@ stages:
       arch: x64
       tls: schannel
       config: Release
-      extraPrepareArgs: -DisableTest
+      extraPrepareArgs: -DisableTest -InstallXdpSdk
       extraBuildArgs: -DisableTest -DisableTools -PGO
 
 - stage: build_winuser_openssl
@@ -69,23 +69,6 @@ stages:
       extraPrepareArgs: -DisableTest
       extraBuildArgs: -DisableTest -DisableTools -PGO
 
-- stage: build_winuser_xdp
-  displayName: Build Windows (XDP)
-  dependsOn: []
-  variables:
-    runCodesignValidationInjection: false
-  jobs:
-  - template: ./templates/build-config-user.yml
-    parameters:
-      image: windows-latest
-      platform: windows
-      arch: x64
-      tls: schannel
-      config: Release
-      extraName: 'xdp'
-      extraPrepareArgs: -DisableTest -InstallXdpSdk
-      extraBuildArgs: -DisableTest -DisableTools -UseXdp -ExtraArtifactDir Xdp -PGO
-
 #
 # Performance Tests
 #
@@ -141,7 +124,7 @@ stages:
 - stage: perf_winuser_xdp
   displayName: Performance Testing Windows (XDP)
   dependsOn:
-  - build_winuser_xdp
+  - build_winuser_schannel
   jobs:
   - template: ./templates/run-performance.yml
     parameters:
@@ -150,8 +133,7 @@ stages:
       localTls: schannel
       remoteTls: schannel
       arch: x64
-      extraArtifactDir: '_Xdp'
-      extraTestArgs: -ExtraArtifactDir _Xdp -XDP
+      extraTestArgs: -XDP
       testTypes: Remote
       extraArgs: -PGO
       failOnRegression: 0

diff --git a/.azure/obtemplates/build-nuget.yml b/.azure/obtemplates/build-nuget.yml
@@ -56,19 +56,6 @@ jobs:
       artifact: drop_build_uwp_build_uwp_openssl_Debug
       path: $(Build.SourcesDirectory)\artifacts\bin\uwp
 
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: drop_build_windows_xdp_build_windows_schannel_Debug_xdp
-      path: $(Build.SourcesDirectory)\artifacts\bin\windows
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: drop_build_windows_xdp_build_windows_schannel_Release_xdp
-      path: $(Build.SourcesDirectory)\artifacts\bin\windows
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: drop_build_windows_xdp_build_windows_openssl_Release_xdp
-      path: $(Build.SourcesDirectory)\artifacts\bin\windows
-
   - task: PowerShell@2
     displayName: Package Nuget
     inputs:
@@ -99,26 +86,6 @@ jobs:
       ${{ if eq(parameters.release, true) }}:
         arguments: -Tls schannel -ReleaseBuild
 
-  - task: PowerShell@2
-    displayName: Package Nuget
-    inputs:
-      pwsh: false
-      filePath: scripts/package-nuget.ps1
-      ${{ if eq(parameters.release, false) }}:
-        arguments: -Tls schannel -XDP
-      ${{ if eq(parameters.release, true) }}:
-        arguments: -Tls schannel -ReleaseBuild -XDP
-
-  - task: PowerShell@2
-    displayName: Package Nuget
-    inputs:
-      pwsh: false
-      filePath: scripts/package-nuget.ps1
-      ${{ if eq(parameters.release, false) }}:
-        arguments: -Tls openssl -XDP
-      ${{ if eq(parameters.release, true) }}:
-        arguments: -Tls openssl -ReleaseBuild -XDP
-
   - task: onebranch.pipeline.signing@1
     inputs:
       command: 'sign'

diff --git a/.azure/obtemplates/build-winuser-xdp.yml b/.azure/obtemplates/build-winuser-xdp.yml
diff --git a/.azure/obtemplates/build-winuser.yml b/.azure/obtemplates/build-winuser.yml
@@ -13,6 +13,13 @@ jobs:
     ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
     ob_sdl_codeSignValidation_excludes: -|**\*.exe # Disable signing requirements for test executables
   steps:
+  - task: PowerShell@2
+    displayName: Prepare Build Machine
+    target: windows_build_container2
+    inputs:
+      pwsh: true
+      filePath: scripts/prepare-machine.ps1
+      arguments: -InstallXdpSdk -ForContainerBuild
   - task: PowerShell@2
     displayName: x64
     target: windows_build_container2

diff --git a/.github/workflows/build-reuse-darwin-framework.yml b/.github/workflows/build-reuse-darwin-framework.yml
@@ -3,6 +3,10 @@ name: Build Darwin Universal
 on:
   workflow_call:
     inputs:
+      ref:
+        required: false
+        default: ''
+        type: string
       config:
         required: false
         default: 'Release'
@@ -35,6 +39,7 @@ jobs:
         arch: [x64, arm64]
     uses: ./.github/workflows/build-reuse-unix.yml
     with:
+      ref: ${{ inputs.ref }}
       config: ${{ inputs.config }}
       plat: ${{ matrix.plat }}
       os: macos-12
@@ -49,6 +54,9 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      with:
+        repository: microsoft/msquic
+        ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:
@@ -83,6 +91,9 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      with:
+        repository: microsoft/msquic
+        ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:
@@ -104,6 +115,9 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      with:
+        repository: microsoft/msquic
+        ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (iOS x64)
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
       with:

diff --git a/.github/workflows/build-reuse-unix.yml b/.github/workflows/build-reuse-unix.yml
@@ -5,6 +5,10 @@ name: Build Unix
 on:
   workflow_call:
     inputs:
+      ref:
+        required: false
+        default: ''
+        type: string
       config:
         required: false
         default: 'Release'
@@ -81,6 +85,9 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      with:
+        repository: microsoft/msquic
+        ref: ${{ inputs.ref }}
     - name: Set ownership
       if: inputs.plat == 'linux'
       run: |