fix azure pipeline (#4396)

microsoft · Jul 11, 2024 · f8d7248 · f8d7248
1 parent 707fcdd
commit f8d7248
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 29 deletions.
diff --git a/.azure/OneBranch.Official.yml b/.azure/OneBranch.Official.yml
@@ -182,25 +182,25 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu-22.04
+          os: ubuntu_2204
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu-22.04
+          os: ubuntu_2204
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu-24.04
+          os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu-24.04
+          os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
 

diff --git a/.azure/OneBranch.PullRequest.yml b/.azure/OneBranch.PullRequest.yml
@@ -178,25 +178,25 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu-22.04
+          os: ubuntu_2204
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu-22.04
+          os: ubuntu_2204
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu-24.04
+          os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu-24.04
+          os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
 

diff --git a/.azure/obtemplates/build-distribution.yml b/.azure/obtemplates/build-distribution.yml
@@ -13,22 +13,39 @@ jobs:
   - template: ./download-artifacts.yml
     parameters:
       platform: linux
+      linuxos: ubuntu_2004
       config: Release
       tls: openssl
   - template: ./download-artifacts.yml
     parameters:
       platform: linux
+      linuxos: ubuntu_2004
       config: Debug
       tls: openssl
 
   - template: ./download-artifacts.yml
     parameters:
       platform: linux
+      linuxos: ubuntu_2204
       config: Release
       tls: openssl3
   - template: ./download-artifacts.yml
     parameters:
       platform: linux
+      linuxos: ubuntu_2204
+      config: Debug
+      tls: openssl3
+
+  - template: ./download-artifacts.yml
+    parameters:
+      platform: linux
+      linuxos: ubuntu_2404
+      config: Release
+      tls: openssl3
+  - template: ./download-artifacts.yml
+    parameters:
+      platform: linux
+      linuxos: ubuntu_2404
       config: Debug
       tls: openssl3
 

diff --git a/.azure/obtemplates/build-linux-packages.yml b/.azure/obtemplates/build-linux-packages.yml
@@ -6,17 +6,20 @@ jobs:
   displayName: Distribution
   strategy:
     matrix:
-      openssl:
-        openssl_name: openssl
-        artifact_suffix: '_openssl'
-      openssl3:
-        openssl_name: openssl3
-        artifact_suffix: '_openssl3'
+      ubuntu_2004:
+        os: ubuntu_2004
+        tls: openssl
+      ubuntu_2204:
+        os: ubuntu_2204
+        tls: openssl3
+      ubuntu_2404:
+        os: ubuntu_2404
+        tls: openssl3
   pool:
     type: linux
   variables:
     ob_outputDirectory: $(Build.SourcesDirectory)/artifacts/dist
-    ob_artifactSuffix: $(artifact_suffix)
+    ob_artifactSuffix: _$(os)_$(tls)
   steps:
   - task: PowerShell@2
     displayName: Prepare Build Machine
@@ -26,12 +29,12 @@ jobs:
       arguments: -ForContainerBuild
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: drop_build_linux_build_linux_$(openssl_name)_Debug
+      artifact: drop_build_linux_build_$(os)_$(tls)_Debug
       path: $(Build.SourcesDirectory)/artifacts/bin/linux
       pattern: '*.tar'
   - task: DownloadPipelineArtifact@2
     inputs:
-      artifact: drop_build_linux_build_linux_$(openssl_name)_Release
+      artifact: drop_build_linux_build_$(os)_$(tls)_Release
       path: $(Build.SourcesDirectory)/artifacts/bin/linux
       pattern: '*.tar'
   - script: | # rebuild artifacts with correct permissions and symlink attributes.

diff --git a/.azure/obtemplates/build-linux.yml b/.azure/obtemplates/build-linux.yml
@@ -2,12 +2,12 @@ parameters:
   config: ''
   tls: 'openssl'
   platform: 'linux'
-  os: 'ubuntu-20.04'
+  os: 'ubuntu_2004'
   xdp: ''
 
 jobs:
-- job: build_${{ parameters.platform }}_${{ parameters.tls }}_${{ parameters.config }}
-  displayName: ${{ parameters.platform }} ${{ parameters.tls }} ${{ parameters.config }}
+- job: build_${{ parameters.os }}_${{ parameters.tls }}_${{ parameters.config }}
+  displayName: ${{ parameters.os }} ${{ parameters.tls }} ${{ parameters.config }}
   pool:
     type: linux
   variables:
@@ -17,9 +17,9 @@ jobs:
   steps:
   - task: PowerShell@2
     displayName: Prepare Build Machine
-    ${{ if eq(parameters.os, 'ubuntu-20.04') }}:
+    ${{ if eq(parameters.os, 'ubuntu_2004') }}:
       target: linux_build_container
-    ${{ elseif eq(parameters.os, 'ubuntu-22.04') }}:
+    ${{ elseif eq(parameters.os, 'ubuntu_2204') }}:
       target: ubuntu_2204_xdp
     ${{ else }}:
       target: ubuntu_2404_cross
@@ -29,9 +29,9 @@ jobs:
       arguments: -Tls ${{ parameters.tls }} -ForContainerBuild
   - task: PowerShell@2
     displayName: x64
-    ${{ if eq(parameters.os, 'ubuntu-20.04') }}:
+    ${{ if eq(parameters.os, 'ubuntu_2004') }}:
       target: linux_build_container
-    ${{ elseif eq(parameters.os, 'ubuntu-22.04') }}:
+    ${{ elseif eq(parameters.os, 'ubuntu_2204') }}:
       target: ubuntu_2204_xdp
     ${{ else }}:
       target: ubuntu_2404_cross
@@ -41,9 +41,9 @@ jobs:
       arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} ${{ parameters.xdp }} -Arch x64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
   - task: PowerShell@2
     displayName: arm64
-    ${{ if eq(parameters.os, 'ubuntu-20.04') }}:
+    ${{ if eq(parameters.os, 'ubuntu_2004') }}:
       target: linux_build_container
-    ${{ elseif eq(parameters.os, 'ubuntu-22.04') }}:
+    ${{ elseif eq(parameters.os, 'ubuntu_2204') }}:
       target: ubuntu_2204_cross
     ${{ else }}:
       target: ubuntu_2404_cross
@@ -53,9 +53,9 @@ jobs:
       arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} -Arch arm64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
   - task: PowerShell@2
     displayName: arm
-    ${{ if eq(parameters.os, 'ubuntu-20.04') }}:
+    ${{ if eq(parameters.os, 'ubuntu_2004') }}:
       target: linux_build_container
-    ${{ elseif eq(parameters.os, 'ubuntu-22.04') }}:
+    ${{ elseif eq(parameters.os, 'ubuntu_2204') }}:
       target: ubuntu_2204_cross
     ${{ else }}:
       target: ubuntu_2404_cross

diff --git a/.azure/obtemplates/download-artifacts.yml b/.azure/obtemplates/download-artifacts.yml
@@ -2,6 +2,7 @@
 
 parameters:
   platform: ''
+  linuxos: 'ubuntu_2004'
   tls: ''
   config: ''
 
@@ -14,7 +15,10 @@ steps:
     preferTriggeringPipeline: true
     runVersion: specific
     runId: $(resources.pipeline.onebranch.runID)
-    artifact: drop_build_${{ parameters.platform }}_build_${{ parameters.platform }}_${{ parameters.tls }}_${{ parameters.config }}
+    ${{ if eq(parameters.platform, 'linux') }}:
+      artifact: drop_build_${{ parameters.platform }}_build_${{ parameters.linuxos }}_${{ parameters.tls }}_${{ parameters.config }}
+    ${{ else }}:
+      artifact: drop_build_${{ parameters.platform }}_build_${{ parameters.platform }}_${{ parameters.tls }}_${{ parameters.config }}
     path: $(Build.SourcesDirectory)/artifacts/bin/${{ parameters.platform }}
 
 - task: PowerShell@2