Skip to content

Commit 5934633

Browse files
authored
Fix issue for lts branch due to branch name change. (#26887)
1 parent d71bd67 commit 5934633

File tree

2 files changed

+139
-153
lines changed

2 files changed

+139
-153
lines changed

.azure-pipelines/live-test.yml

Lines changed: 107 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,30 @@
11
parameters:
2-
- name: os_windows_2019
3-
displayName: Windows 2019 Image Version
4-
type: string
5-
default: windows-2019
6-
- name: os_windows_2022
7-
displayName: Windows 2022 Image Version
8-
type: string
9-
default: windows-2022
10-
- name: os_linux
11-
displayName: Linux Image Version
12-
type: string
13-
default: ubuntu-latest
14-
- name: os_macos
15-
displayName: MacOS Image Version
16-
type: string
17-
default: macOS-latest
18-
- name: win_ps_5_1
19-
displayName: Windows PowerShell 5.1 Version
20-
type: string
21-
default: 5.1
22-
- name: ps_7_2_x
23-
displayName: PowerShell 7.2.x Version
24-
type: string
25-
default: 7.2.*
26-
- name: ps_7_3_x
27-
displayName: PowerShell 7.3.x Version
28-
type: string
29-
default: 7.3.*
30-
- name: ps_7_4_x
31-
displayName: PowerShell 7.4.x Version
32-
type: string
33-
default: 7.4.*
34-
- name: ps_latest
35-
displayName: PowerShell Latest Version
36-
type: string
37-
default: latest
38-
- name: dotnet_sdk_6
39-
displayName: .NET 6 SDK Version
40-
type: string
41-
default: 6.0.x
42-
- name: dotnet_sdk_7
43-
displayName: .NET 7 SDK Version
44-
type: string
45-
default: 7.0.x
46-
- name: dotnet_sdk_8
47-
displayName: .NET 8 SDK Version
48-
type: string
49-
default: 8.0.x
2+
- name: GalleryName
3+
displayName: Gallery Name
4+
type: string
5+
default: DailyBuild
6+
values:
7+
- DailyBuild
8+
- Sign
9+
- PSGallery
10+
- name: PipelineBuildId
11+
displayName: Pipeline Build Id for Artifacts
12+
type: string
13+
default: ' '
5014

5115
variables:
16+
os_windows_2019: windows-2019
17+
os_windows_2022: windows-2022
18+
os_linux: ubuntu-latest
19+
os_macos: macOS-latest
20+
win_ps_5_1: 5.1
21+
ps_7_2_x: 7.2.*
22+
ps_7_3_x: 7.3.*
23+
ps_7_4_x: 7.4.*
24+
ps_latest: latest
25+
dotnet_sdk_6: 6.0.x
26+
dotnet_sdk_7: 7.0.x
27+
dotnet_sdk_8: 8.0.x
5228
ArtifactsName: LiveTestArtifacts
5329
DataLocation: $(Pipeline.Workspace)/$(ArtifactsName)
5430
SuppressAzurePowerShellBreakingChangeWarnings: true
@@ -71,146 +47,174 @@ stages:
7147
- template: util/live-test-steps.yml
7248
parameters:
7349
name: 'win_ps_5_1_win_2019'
74-
vmImage: ${{ parameters.os_windows_2019 }}
50+
vmImage: ${{ variables.os_windows_2019 }}
7551
osType: 'Windows'
76-
psVersion: ${{ parameters.win_ps_5_1 }}
77-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
52+
psVersion: ${{ variables.win_ps_5_1 }}
53+
dotnetVersion: ${{ variables.dotnet_sdk_6 }}
54+
galleryName: ${{ parameters.GalleryName }}
55+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
7856

7957
- template: util/live-test-steps.yml
8058
parameters:
8159
name: 'win_ps_5_1_win_2022'
82-
vmImage: ${{ parameters.os_windows_2022 }}
60+
vmImage: ${{ variables.os_windows_2022 }}
8361
osType: 'Windows'
84-
psVersion: ${{ parameters.win_ps_5_1 }}
85-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
62+
psVersion: ${{ variables.win_ps_5_1 }}
63+
dotnetVersion: ${{ variables.dotnet_sdk_6 }}
64+
galleryName: ${{ parameters.GalleryName }}
65+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
8666

8767
- template: util/live-test-steps.yml
8868
parameters:
8969
name: 'ps_7_2_x_win_2019'
90-
vmImage: ${{ parameters.os_windows_2019 }}
70+
vmImage: ${{ variables.os_windows_2019 }}
9171
osType: 'Windows'
92-
psVersion: ${{ parameters.ps_7_2_x }}
93-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
72+
psVersion: ${{ variables.ps_7_2_x }}
73+
dotnetVersion: ${{ variables.dotnet_sdk_6 }}
74+
galleryName: ${{ parameters.GalleryName }}
75+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
9476

9577
- template: util/live-test-steps.yml
9678
parameters:
9779
name: 'ps_7_3_x_win_2019'
98-
vmImage: ${{ parameters.os_windows_2019 }}
80+
vmImage: ${{ variables.os_windows_2019 }}
9981
osType: 'Windows'
100-
psVersion: ${{ parameters.ps_7_3_x }}
101-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
82+
psVersion: ${{ variables.ps_7_3_x }}
83+
dotnetVersion: ${{ variables.dotnet_sdk_7 }}
84+
galleryName: ${{ parameters.GalleryName }}
85+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
10286

10387
- template: util/live-test-steps.yml
10488
parameters:
10589
name: 'ps_7_4_x_win_2019'
106-
vmImage: ${{ parameters.os_windows_2019 }}
90+
vmImage: ${{ variables.os_windows_2019 }}
10791
osType: 'Windows'
108-
psVersion: ${{ parameters.ps_7_4_x }}
109-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
92+
psVersion: ${{ variables.ps_7_4_x }}
93+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
94+
galleryName: ${{ parameters.GalleryName }}
95+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
11096

11197
- template: util/live-test-steps.yml
11298
parameters:
11399
name: 'ps_latest_win_2019'
114-
vmImage: ${{ parameters.os_windows_2019 }}
100+
vmImage: ${{ variables.os_windows_2019 }}
115101
osType: 'Windows'
116-
psVersion: ${{ parameters.ps_latest }}
117-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
102+
psVersion: ${{ variables.ps_latest }}
103+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
104+
galleryName: ${{ parameters.GalleryName }}
105+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
118106

119107
- template: util/live-test-steps.yml
120108
parameters:
121109
name: 'ps_7_2_x_win_2022'
122-
vmImage: ${{ parameters.os_windows_2022 }}
110+
vmImage: ${{ variables.os_windows_2022 }}
123111
osType: 'Windows'
124-
psVersion: ${{ parameters.ps_7_2_x }}
125-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
112+
psVersion: ${{ variables.ps_7_2_x }}
113+
dotnetVersion: ${{ variables.dotnet_sdk_6 }}
114+
galleryName: ${{ parameters.GalleryName }}
115+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
126116

127117
- template: util/live-test-steps.yml
128118
parameters:
129119
name: 'ps_7_3_x_win_2022'
130-
vmImage: ${{ parameters.os_windows_2022 }}
120+
vmImage: ${{ variables.os_windows_2022 }}
131121
osType: 'Windows'
132-
psVersion: ${{ parameters.ps_7_3_x }}
133-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
122+
psVersion: ${{ variables.ps_7_3_x }}
123+
dotnetVersion: ${{ variables.dotnet_sdk_7 }}
124+
galleryName: ${{ parameters.GalleryName }}
125+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
134126

135127
- template: util/live-test-steps.yml
136128
parameters:
137129
name: 'ps_7_4_x_win_2022'
138-
vmImage: ${{ parameters.os_windows_2022 }}
130+
vmImage: ${{ variables.os_windows_2022 }}
139131
osType: 'Windows'
140-
psVersion: ${{ parameters.ps_7_4_x }}
141-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
132+
psVersion: ${{ variables.ps_7_4_x }}
133+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
134+
galleryName: ${{ parameters.GalleryName }}
135+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
142136

143137
- template: util/live-test-steps.yml
144138
parameters:
145139
name: 'ps_latest_win_2022'
146-
vmImage: ${{ parameters.os_windows_2022 }}
140+
vmImage: ${{ variables.os_windows_2022 }}
147141
osType: 'Windows'
148-
psVersion: ${{ parameters.ps_latest }}
149-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
142+
psVersion: ${{ variables.ps_latest }}
143+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
144+
galleryName: ${{ parameters.GalleryName }}
145+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
150146

151147
- template: util/live-test-steps.yml
152148
parameters:
153149
name: 'ps_7_2_x_linux'
154-
vmImage: ${{ parameters.os_linux }}
150+
vmImage: ${{ variables.os_linux }}
155151
osType: 'Linux'
156-
psVersion: ${{ parameters.ps_7_2_x }}
157-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
152+
psVersion: ${{ variables.ps_7_2_x }}
153+
dotnetVersion: ${{ variables.dotnet_sdk_6 }}
154+
galleryName: ${{ parameters.GalleryName }}
155+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
158156

159157
- template: util/live-test-steps.yml
160158
parameters:
161159
name: 'ps_7_3_x_linux'
162-
vmImage: ${{ parameters.os_linux }}
160+
vmImage: ${{ variables.os_linux }}
163161
osType: 'Linux'
164-
psVersion: ${{ parameters.ps_7_3_x }}
165-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
162+
psVersion: ${{ variables.ps_7_3_x }}
163+
dotnetVersion: ${{ variables.dotnet_sdk_7 }}
164+
galleryName: ${{ parameters.GalleryName }}
165+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
166166

167167
- template: util/live-test-steps.yml
168168
parameters:
169169
name: 'ps_7_4_x_linux'
170-
vmImage: ${{ parameters.os_linux }}
170+
vmImage: ${{ variables.os_linux }}
171171
osType: 'Linux'
172-
psVersion: ${{ parameters.ps_7_4_x }}
173-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
172+
psVersion: ${{ variables.ps_7_4_x }}
173+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
174+
galleryName: ${{ parameters.GalleryName }}
175+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
174176

175177
- template: util/live-test-steps.yml
176178
parameters:
177179
name: 'ps_latest_linux'
178-
vmImage: ${{ parameters.os_linux }}
180+
vmImage: ${{ variables.os_linux }}
179181
osType: 'Linux'
180-
psVersion: ${{ parameters.ps_latest }}
181-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
182+
psVersion: ${{ variables.ps_latest }}
183+
dotnetVersion: ${{ variables.dotnet_sdk_8 }}
184+
galleryName: ${{ parameters.GalleryName }}
185+
pipelineBuildId: ${{ parameters.PipelineBuildId }}
182186

183187
# - template: util/live-test-steps.yml
184188
# parameters:
185189
# name: 'ps_7_2_x_macOS'
186-
# vmImage: ${{ parameters.os_macos }}
190+
# vmImage: ${{ variables.os_macos }}
187191
# osType: 'MacOS'
188-
# psVersion: ${{ parameters.ps_7_2_x }}
189-
# dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
192+
# psVersion: ${{ variables.ps_7_2_x }}
193+
# dotnetVersion: ${{ variables.dotnet_sdk_6 }}
190194

191195
# - template: util/live-test-steps.yml
192196
# parameters:
193197
# name: 'ps_7_3_x_macOS'
194-
# vmImage: ${{ parameters.os_macos }}
198+
# vmImage: ${{ variables.os_macos }}
195199
# osType: 'MacOS'
196-
# psVersion: ${{ parameters.ps_7_3_x }}
197-
# dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
200+
# psVersion: ${{ variables.ps_7_3_x }}
201+
# dotnetVersion: ${{ variables.dotnet_sdk_7 }}
198202

199203
# - template: util/live-test-steps.yml
200204
# parameters:
201205
# name: 'ps_7_4_x_macOS'
202-
# vmImage: ${{ parameters.os_macos }}
206+
# vmImage: ${{ variables.os_macos }}
203207
# osType: 'MacOS'
204-
# psVersion: ${{ parameters.ps_7_4_x }}
205-
# dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
208+
# psVersion: ${{ variables.ps_7_4_x }}
209+
# dotnetVersion: ${{ variables.dotnet_sdk_8 }}
206210

207211
# - template: util/live-test-steps.yml
208212
# parameters:
209213
# name: 'ps_latest_macOS'
210-
# vmImage: ${{ parameters.os_macos }}
214+
# vmImage: ${{ variables.os_macos }}
211215
# osType: 'MacOS'
212-
# psVersion: ${{ parameters.ps_latest }}
213-
# dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
216+
# psVersion: ${{ variables.ps_latest }}
217+
# dotnetVersion: ${{ variables.dotnet_sdk_8 }}
214218

215219
- stage: Report
216220
displayName: Send Report
@@ -231,7 +235,7 @@ stages:
231235
displayName: Download live test results
232236
inputs:
233237
buildType: 'current'
234-
targetPath: $(Pipeline.Workspace)/$(ArtifactsName)
238+
targetPath: $(DataLocation)
235239

236240
- task: PowerShell@2
237241
displayName: Send live test report

0 commit comments

Comments
 (0)