Skip to content

Commit 7eff605

Browse files
mszhanyiPrathik Rao
authored and
Prathik Rao
committed
Make Nuget workflow easy to debug (#15808)
### Description Fix the bug in #15693 ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. -->
1 parent 3dbcb13 commit 7eff605

File tree

4 files changed

+83
-26
lines changed

4 files changed

+83
-26
lines changed

tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml

+22-15
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ stages:
104104
AdditionalBuildFlags: ''
105105
AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos'
106106
BuildVariant: 'default'
107+
SpecificArtifact: ${{ parameters.SpecificArtifact }}
108+
BuildId: ${{ parameters.BuildId }}
107109

108110
- template: templates/ondevice-training-cpu-packaging-pipeline.yml
109111
parameters:
@@ -219,26 +221,29 @@ stages:
219221
submodules: false
220222
- template: templates/set-version-number-variables-step.yml
221223

222-
- task: DownloadPipelineArtifact@2
223-
displayName: 'Download Pipeline Artifact - Win x64'
224-
inputs:
225-
buildType: 'current'
226-
artifactName: 'drop-onnxruntime-java-win-x64-tensorrt'
227-
targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64'
224+
- template: templates/flex-downloadPipelineArtifact.yml
225+
parameters:
226+
StepName: 'Download Pipeline Artifact - Win x64'
227+
ArtifactName: 'drop-onnxruntime-java-win-x64-tensorrt'
228+
TargetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-win-x64'
229+
SpecificArtifact: ${{ parameters.specificArtifact }}
230+
BuildId: ${{ parameters.BuildId }}
228231

229-
- task: DownloadPipelineArtifact@2
230-
displayName: 'Download Pipeline Artifact - Linux x64'
231-
inputs:
232-
buildType: 'current'
232+
- template: templates/flex-downloadPipelineArtifact.yml
233+
parameters:
234+
stepName: 'Download Pipeline Artifact - Linux x64'
233235
artifactName: 'drop-onnxruntime-java-linux-x64-cuda'
234236
targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64'
237+
SpecificArtifact: ${{ parameters.specificArtifact }}
238+
BuildId: ${{ parameters.BuildId }}
235239

236-
- task: DownloadPipelineArtifact@2
237-
displayName: 'Download Pipeline Artifact - Linux x64'
238-
inputs:
239-
buildType: 'current'
240-
artifactName: 'drop-onnxruntime-java-linux-x64-tensorrt'
240+
- template: templates/flex-downloadPipelineArtifact.yml
241+
parameters:
242+
StepName: 'Download Pipeline Artifact - Linux x64'
243+
ArtifactName: 'drop-onnxruntime-java-linux-x64-tensorrt'
241244
targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64-tensorrt'
245+
SpecificArtifact: ${{ parameters.specificArtifact }}
246+
BuildId: ${{ parameters.BuildId }}
242247

243248
- task: PowerShell@2
244249
displayName: 'PowerShell Script'
@@ -766,6 +771,8 @@ stages:
766771
ArtifactSuffix: 'GPU'
767772
StageSuffix: 'GPU'
768773
NugetPackageName : 'Microsoft.ML.OnnxRuntime.Gpu'
774+
SpecificArtifact: ${{ parameters.specificArtifact }}
775+
BuildId: ${{ parameters.BuildId }}
769776

770777
- template: nuget/templates/dml-vs-2019.yml
771778
parameters:

tools/ci_build/github/azure-pipelines/nuget/templates/test_linux.yml

+17-11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ parameters:
44
NugetPackageName : ''
55
StageSuffix: 'CPU'
66
NativePackagePrefix: 'onnxruntime'
7+
SpecificArtifact: false
8+
BuildId: '0'
79

810
stages:
911
- stage: NuGet_Test_Linux_${{ parameters.StageSuffix }}
@@ -20,19 +22,23 @@ stages:
2022
variables:
2123
- name: OnnxRuntimeBuildDirectory
2224
value: '$(Build.BinariesDirectory)'
23-
steps:
2425

25-
- task: DownloadPipelineArtifact@0
26-
displayName: 'Download Signed NuGet'
27-
inputs:
28-
artifactName: drop-signed-nuget-${{ parameters.ArtifactSuffix }}
29-
targetPath: '$(Build.BinariesDirectory)/nuget-artifact'
26+
steps:
27+
- template: ../../templates/flex-downloadPipelineArtifact.yml
28+
parameters:
29+
StepName: 'Download Signed NuGet'
30+
ArtifactName: drop-signed-nuget-${{ parameters.ArtifactSuffix }}
31+
TargetPath: '$(Build.BinariesDirectory)/nuget-artifact'
32+
SpecificArtifact: ${{ parameters.SpecificArtifact }}
33+
BuildId: ${{ parameters.BuildId }}
3034

31-
- task: DownloadPipelineArtifact@0
32-
displayName: 'Download Linux CustomOp TestData'
33-
inputs:
34-
artifactName: '${{ parameters.NativePackagePrefix }}-linux-x64'
35-
targetPath: '$(Build.BinariesDirectory)/testdata'
35+
- template: ../../templates/flex-downloadPipelineArtifact.yml
36+
parameters:
37+
StepName: 'Download Linux CustomOp TestData'
38+
ArtifactName: 'onnxruntime-linux-x64'
39+
TargetPath: '$(Build.BinariesDirectory)/testdata'
40+
SpecificArtifact: ${{ parameters.specificArtifact }}
41+
BuildId: ${{ parameters.BuildId }}
3642

3743
- template: get-nuget-package-version-as-variable.yml
3844
parameters:

tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml

+12
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ parameters:
3838
type: string
3939
default: 'default'
4040

41+
- name: SpecificArtifact
42+
displayName: Use Specific Artifact
43+
type: boolean
44+
default: false
45+
46+
- name: BuildId
47+
displayName: Specific Artifact's BuildId
48+
type: string
49+
default: '0'
50+
4151
stages:
4252
- template: linux-cpu-packaging-pipeline.yml
4353
parameters:
@@ -772,6 +782,8 @@ stages:
772782
AgentPool : aiinfra-Linux-CPU
773783
NugetPackageName : 'Microsoft.ML.OnnxRuntime'
774784
ArtifactSuffix: 'CPU'
785+
SpecificArtifact: ${{ parameters.SpecificArtifact }}
786+
BuildId: ${{ parameters.BuildId }}
775787

776788
- template: ../nuget/templates/test_macos.yml
777789
parameters:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
parameters:
2+
- name: StepName
3+
type: string
4+
5+
- name: ArtifactName
6+
type: string
7+
8+
- name: TargetPath
9+
type: string
10+
11+
- name: SpecificArtifact
12+
type: boolean
13+
default: false
14+
15+
- name: BuildId
16+
type: string
17+
default: '0'
18+
19+
steps:
20+
- task: DownloadPipelineArtifact@2
21+
displayName: ${{ parameters.StepName }}}
22+
inputs:
23+
artifactName: ${{ parameters.ArtifactName}}
24+
targetPath: '${{ parameters.TargetPath }}'
25+
${{ if eq(parameters.SpecificArtifact, false)}}:
26+
buildType: 'current'
27+
${{ else }}:
28+
source: 'specific'
29+
project: $(System.TeamProject)
30+
pipeline: $(Build.DefinitionName)
31+
runVersion: 'specific'
32+
buildId: ${{ parameters.BuildId }}

0 commit comments

Comments
 (0)