Generate Ubuntu 22.04 Packages (using OpenSSL v3) (#3593)

.azure/OneBranch.PullRequest.yml

@@ -22,6 +22,10 @@ parameters:
   displayName: 'Enable debug output'
   type: boolean
   default: false
+- name: 'WindowsContainerImage2DockerTag'
+  displayName: 'WindowsContainerImage2 DockerTag'
+  type: string
+  default: 'latest'
 
 variables:
   system.debug: ${{ parameters.debug }}
@@ -33,8 +37,9 @@ variables:
   NUGET_XMLDOC_MODE: none
 
   WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2019/vse2019:latest'
-  WindowsContainerImage2: 'cdpxwin1809.azurecr.io/user/corenet/msquic:latest' # Docker image which is used to build the project https://aka.ms/obpipelines/containers
-  LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-1804:latest'
+  WindowsContainerImage2: 'cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io/b7b51c2f-738e-43e4-8f76-05d9a8e5f6d7/official/msquicbuild:${{ parameters.WindowsContainerImage2DockerTag }}'
+  LinuxContainerImage: 'ghcr.io/microsoft/msquic/linux-build-xcomp:22.04'
+  LinuxContainerImage2: 'ghcr.io/microsoft/msquic/linux-build-xcomp:20.04'
 
 resources:
   repositories:
@@ -154,6 +159,14 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
+      - template: .azure/obtemplates/build-linux.yml@self
+        parameters:
+          config: Release
+          tls: openssl3
+      - template: .azure/obtemplates/build-linux.yml@self
+        parameters:
+          config: Debug
+          tls: openssl3
 
     - stage: package_linux
       displayName: Package Linux

.azure/obtemplates/build-linux-packages.yml

@@ -4,10 +4,19 @@ parameters:
 jobs:
 - job: distribution
   displayName: Distribution
+  strategy:
+    matrix:
+      ubuntu_20_04:
+        distro_suffix: '_20_04'
+        distro_openssl: openssl
+      ubuntu_22_04:
+        distro_suffix: '_22_04'
+        distro_openssl: openssl3
   pool:
     type: linux
   variables:
     ob_outputDirectory: $(Build.SourcesDirectory)/artifacts/dist
+    ob_artifactSuffix: $(distro_suffix)
   steps:
   - task: PowerShell@2
     displayName: Prepare Build Machine
@@ -17,12 +26,12 @@ jobs:
       arguments: -ForOneBranchPackage
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: drop_build_linux_build_linux_openssl_Debug
+      artifact: drop_build_linux_build_linux_$(distro_openssl)_Debug
       path: $(Build.SourcesDirectory)/artifacts/bin/linux
       pattern: '*.tar'
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: drop_build_linux_build_linux_openssl_Release
+      artifact: drop_build_linux_build_linux_$(distro_openssl)_Release
       path: $(Build.SourcesDirectory)/artifacts/bin/linux
       pattern: '*.tar'
   - script: | # rebuild artifacts with correct permissions and symlink attributes.

scripts/package-distribution.ps1

@@ -163,12 +163,16 @@ foreach ($Build in $AllBuilds) {
         Write-Output "Packaging $Build"
         $OldLoc = Get-Location
         Set-Location $RootDir
+        $Tls = "openssl"
+        if ($BuildBaseName -like "*openssl3*") {
+            $Tls = "openssl3"
+        }
         if ($BuildBaseName -like "*arm64_*") {
-            & $RootDir/scripts/make-packages.sh --output $DistDir --arch arm64
+            & $RootDir/scripts/make-packages.sh --output $DistDir --arch arm64 --tls $Tls
         } elseif ($BuildBaseName -like "*arm_*") {
-            & $RootDir/scripts/make-packages.sh --output $DistDir --arch arm
+            & $RootDir/scripts/make-packages.sh --output $DistDir --arch arm --tls $Tls
         } else {
-            & $RootDir/scripts/make-packages.sh --output $DistDir # x64
+            & $RootDir/scripts/make-packages.sh --output $DistDir --tls $Tls # x64
         }
         Set-Location $OldLoc
     }