Merge branch 'main' into anrossi/test-log-tls-secrets

microsoft · Aug 17, 2024 · d95508f · d95508f
2 parents a3ff8a8 + 7109203
commit d95508f
Show file tree

Hide file tree

Showing 159 changed files with 3,640 additions and 4,089 deletions.
diff --git a/.azure/OneBranch.Official.yml b/.azure/OneBranch.Official.yml
@@ -27,7 +27,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 - name: 'WindowsContainerImage2DockerTag'
   displayName: 'WindowsContainerImage2 DockerTag'
   type: string
-  default: '20240309.1' # if initializing docker takes too long, grab a newer docker image from Docker.Official pipeline.
+  default: '20240713.1' # if initializing docker takes too long, grab a newer docker image from Docker.Official pipeline.
 
 variables:
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
@@ -78,12 +78,12 @@ extends:
       - container: linux_build_container # Default container
         image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-cross'
         type: Linux
-      - container: ubuntu_2204_xdp
-        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-xdp'
-        type: Linux
-      - container: ubuntu_2204_cross
+      - container: kernel5_15_cross
         image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-cross'
         type: Linux
+      - container: kernel6_8_cross
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-24.04-cross'
+        type: Linux
 
     stages:
     - stage: build_winkernel
@@ -179,11 +179,23 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
+          kernel: "kernel5_15"
+          tls: openssl3
+      - template: .azure/obtemplates/build-linux.yml@self
+        parameters:
+          config: Debug
+          kernel: "kernel5_15"
+          tls: openssl3
+      - template: .azure/obtemplates/build-linux.yml@self
+        parameters:
+          config: Release
+          kernel: "kernel6_8"
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
+          kernel: "kernel6_8"
           tls: openssl3
           xdp: "-UseXdp"
 
@@ -195,6 +207,15 @@ extends:
       - template: .azure/obtemplates/build-linux-packages.yml@self
         parameters:
           sign: true
+          kernel: "kernel5_4"
+      - template: .azure/obtemplates/build-linux-packages.yml@self
+        parameters:
+          sign: true
+          kernel: "kernel5_15"
+      - template: .azure/obtemplates/build-linux-packages.yml@self
+        parameters:
+          sign: true
+          kernel: "kernel6_8"
 
     - stage: package_windows
       displayName: Package Windows

diff --git a/.azure/OneBranch.Package.yml b/.azure/OneBranch.Package.yml
@@ -95,7 +95,7 @@ extends:
           ob_createvpack_owneralias: quicdev
           ob_createvpack_description: msquic.$(Build.SourceBranchName)
           ob_createvpack_versionAs: string
-          ob_createvpack_version: 2.4.0-$(Build.BuildId)
+          ob_createvpack_version: 2.5.0-$(Build.BuildId)
         steps:
         - task: DownloadPipelineArtifact@2
           inputs: