fix

microsoft · Aug 13, 2024 · 526688a · 526688a
1 parent 1448ce5
commit 526688a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.azure/OneBranch.PullRequest.yml b/.azure/OneBranch.PullRequest.yml
@@ -172,28 +172,33 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
+          job_and_artifact_suffix: 'openssl_Debug'
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
           os: ubuntu_2204
           tls: openssl3
+          job_and_artifact_suffix: 'openssl3_Release'
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
           os: ubuntu_2204
           tls: openssl3
+          job_and_artifact_suffix: 'openssl3_Debug'
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
           os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
+          job_and_artifact_suffix: 'openssl3_xdp_Release'
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
           os: ubuntu_2404
           tls: openssl3
           xdp: "-UseXdp"
+          job_and_artifact_suffix: 'openssl3_xdp_Debug'
 
     - stage: package_linux
       displayName: Package Linux

diff --git a/.azure/obtemplates/build-distribution.yml b/.azure/obtemplates/build-distribution.yml
@@ -42,12 +42,14 @@ jobs:
       linuxos: ubuntu_2404
       config: Release
       tls: openssl3
+      xdp: -UseXdp
   - template: ./download-artifacts.yml
     parameters:
       platform: linux
       linuxos: ubuntu_2404
       config: Debug
       tls: openssl3
+      xdp: -UseXdp
 
   - template: ./download-artifacts.yml
     parameters:

diff --git a/.azure/obtemplates/build-linux.yml b/.azure/obtemplates/build-linux.yml
@@ -4,10 +4,11 @@ parameters:
   platform: 'linux'
   os: 'ubuntu_2004'
   xdp: ''
+  job_and_artifact_suffix: 'openssl_Release'
 
 jobs:
-- job: build_${{ parameters.os }}_${{ parameters.tls }}_${{ parameters.config }}
-  displayName: ${{ parameters.os }} ${{ parameters.tls }} ${{ parameters.config }}
+- job: build_${{ parameters.job_and_artifact_suffix }}
+  displayName: ${{ parameters.platform }} ${{ parameters.tls }} ${{ parameters.config }}
   pool:
     type: linux
   variables:

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

diff --git a/scripts/make-packages.sh b/scripts/make-packages.sh
@@ -194,7 +194,7 @@ if [ "$OS" == "linux" ]; then
         --license MIT \
         --url https://github.com/microsoft/msquic \
         --log error \
-        ${FILES}
+        ${FILES} ${ARTIFACTS}/datapath_raw_xdp_kern.o=/usr/${LIBDIR}/datapath_raw_xdp_kern.o
     fi
   fi