Skip to content

Commit 045c623

Browse files
authored
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 5e9b423 commit 045c623

File tree

4 files changed

+94
-26
lines changed

4 files changed

+94
-26
lines changed

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

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ parameters:
3939
type: number
4040
default: 0
4141

42+
# these 2 parameters are used for debugging.
43+
- name: SpecificArtifact
44+
displayName: Use Specific Artifact (Debugging only)
45+
type: boolean
46+
default: false
47+
48+
- name: BuildId
49+
displayName: Pipeline BuildId, you could find it in the URL
50+
type: string
51+
default: '0'
52+
4253
resources:
4354
repositories:
4455
- repository: onnxruntime-inference-examples # The name used to reference this repository in the checkout step
@@ -92,6 +103,8 @@ stages:
92103
AdditionalBuildFlags: ''
93104
AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos'
94105
BuildVariant: 'default'
106+
SpecificArtifact: ${{ parameters.SpecificArtifact }}
107+
BuildId: ${{ parameters.BuildId }}
95108

96109
- template: templates/ondevice-training-cpu-packaging-pipeline.yml
97110
parameters:
@@ -207,26 +220,29 @@ stages:
207220
submodules: false
208221
- template: templates/set-version-number-variables-step.yml
209222

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

217-
- task: DownloadPipelineArtifact@2
218-
displayName: 'Download Pipeline Artifact - Linux x64'
219-
inputs:
220-
buildType: 'current'
231+
- template: templates/flex-downloadPipelineArtifact.yml
232+
parameters:
233+
stepName: 'Download Pipeline Artifact - Linux x64'
221234
artifactName: 'drop-onnxruntime-java-linux-x64-cuda'
222235
targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64'
236+
SpecificArtifact: ${{ parameters.specificArtifact }}
237+
BuildId: ${{ parameters.BuildId }}
223238

224-
- task: DownloadPipelineArtifact@2
225-
displayName: 'Download Pipeline Artifact - Linux x64'
226-
inputs:
227-
buildType: 'current'
228-
artifactName: 'drop-onnxruntime-java-linux-x64-tensorrt'
239+
- template: templates/flex-downloadPipelineArtifact.yml
240+
parameters:
241+
StepName: 'Download Pipeline Artifact - Linux x64'
242+
ArtifactName: 'drop-onnxruntime-java-linux-x64-tensorrt'
229243
targetPath: '$(Build.BinariesDirectory)\java-artifact\onnxruntime-java-linux-x64-tensorrt'
244+
SpecificArtifact: ${{ parameters.specificArtifact }}
245+
BuildId: ${{ parameters.BuildId }}
230246

231247
- task: PowerShell@2
232248
displayName: 'PowerShell Script'
@@ -752,6 +768,8 @@ stages:
752768
ArtifactSuffix: 'GPU'
753769
StageSuffix: 'GPU'
754770
NugetPackageName : 'Microsoft.ML.OnnxRuntime.Gpu'
771+
SpecificArtifact: ${{ parameters.specificArtifact }}
772+
BuildId: ${{ parameters.BuildId }}
755773

756774
- template: nuget/templates/dml-vs-2019.yml
757775
parameters:

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

Lines changed: 17 additions & 11 deletions
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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ parameters:
4343
type: string
4444
default: 'default'
4545

46+
- name: SpecificArtifact
47+
displayName: Use Specific Artifact
48+
type: boolean
49+
default: false
50+
51+
- name: BuildId
52+
displayName: Specific Artifact's BuildId
53+
type: string
54+
default: '0'
55+
4656
stages:
4757
- template: linux-cpu-packaging-pipeline.yml
4858
parameters:
@@ -775,6 +785,8 @@ stages:
775785
AgentPool : aiinfra-Linux-CPU
776786
NugetPackageName : 'Microsoft.ML.OnnxRuntime'
777787
ArtifactSuffix: 'CPU'
788+
SpecificArtifact: ${{ parameters.SpecificArtifact }}
789+
BuildId: ${{ parameters.BuildId }}
778790

779791
- template: ../nuget/templates/test_macos.yml
780792
parameters:
Lines changed: 32 additions & 0 deletions
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)