Skip to content

Commit 2a940c6

Browse files
authored
artifactSuffix is used to create jobName in build and thus cant have period in it (#806)
1 parent 50fca15 commit 2a940c6

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.vsts-ci/ltsReleaseStage.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ stages:
6464
parameters:
6565
archName: 'Build_linux_amd64'
6666
imageName: ubuntu20.04
67-
artifactSuffix: ubuntu20.04
67+
artifactSuffix: ubuntu2004
6868
poolOS: 'linux'
6969
poolHostArchitecture: 'amd64'
7070
buildKitValue: 1
@@ -74,7 +74,7 @@ stages:
7474
parameters:
7575
archName: 'Build_linux_amd64'
7676
imageName: ubuntu22.04
77-
artifactSuffix: ubuntu22.04
77+
artifactSuffix: ubuntu2204
7878
poolOS: 'linux'
7979
poolHostArchitecture: 'amd64'
8080
buildKitValue: 1
@@ -84,7 +84,7 @@ stages:
8484
parameters:
8585
archName: 'Build_linux_arm32'
8686
imageName: ubuntu20.04-arm32v7
87-
artifactSuffix: ubuntu20.04_arm32v7
87+
artifactSuffix: ubuntu2004_arm32v7
8888
poolOS: 'linux'
8989
poolHostArchitecture: 'arm64'
9090
buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
9494
parameters:
9595
archName: 'Build_linux_arm32'
9696
imageName: ubuntu22.04-arm32v7
97-
artifactSuffix: ubuntu22.04_arm32v7
97+
artifactSuffix: ubuntu2204_arm32v7
9898
poolOS: 'linux'
9999
poolHostArchitecture: 'arm64'
100100
buildKitValue: 1
@@ -194,7 +194,7 @@ stages:
194194
parameters:
195195
archName: 'Build_linux_amd64'
196196
imageName: ubuntu20.04\test-deps
197-
artifactSuffix: ubuntu20.04_test_deps
197+
artifactSuffix: ubuntu2004_test_deps
198198
poolOS: 'linux'
199199
poolHostArchitecture: 'amd64'
200200
buildKitValue: 1
@@ -204,7 +204,7 @@ stages:
204204
parameters:
205205
archName: 'Build_linux_amd64'
206206
imageName: ubuntu22.04\test-deps
207-
artifactSuffix: ubuntu22.04_test_deps
207+
artifactSuffix: ubuntu2204_test_deps
208208
poolOS: 'linux'
209209
poolHostArchitecture: 'amd64'
210210
buildKitValue: 1

.vsts-ci/previewReleaseStage.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ stages:
8484
parameters:
8585
archName: 'Build_linux_amd64'
8686
imageName: ubuntu20.04
87-
artifactSuffix: ubuntu20.04
87+
artifactSuffix: ubuntu2004
8888
poolOS: 'linux'
8989
poolHostArchitecture: 'amd64'
9090
buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
9494
parameters:
9595
archName: 'Build_linux_amd64'
9696
imageName: ubuntu22.04
97-
artifactSuffix: ubuntu22.04
97+
artifactSuffix: ubuntu2204
9898
poolOS: 'linux'
9999
poolHostArchitecture: 'amd64'
100100
buildKitValue: 1
@@ -104,7 +104,7 @@ stages:
104104
parameters:
105105
archName: 'Build_linux_arm32'
106106
imageName: ubuntu20.04-arm32v7
107-
artifactSuffix: ubuntu20.04_arm32v7
107+
artifactSuffix: ubuntu2004_arm32v7
108108
poolOS: 'linux'
109109
poolHostArchitecture: 'arm64'
110110
buildKitValue: 1
@@ -114,7 +114,7 @@ stages:
114114
parameters:
115115
archName: 'Build_linux_arm32'
116116
imageName: ubuntu22.04-arm32v7
117-
artifactSuffix: ubuntu22.04_arm32v7
117+
artifactSuffix: ubuntu2204_arm32v7
118118
poolOS: 'linux'
119119
poolHostArchitecture: 'arm64'
120120
buildKitValue: 1
@@ -224,7 +224,7 @@ stages:
224224
parameters:
225225
archName: 'Build_linux_amd64'
226226
imageName: ubuntu20.04\test-deps
227-
artifactSuffix: ubuntu20.04_test_deps
227+
artifactSuffix: ubuntu2004_test_deps
228228
poolOS: 'linux'
229229
poolHostArchitecture: 'amd64'
230230
buildKitValue: 1
@@ -234,7 +234,7 @@ stages:
234234
parameters:
235235
archName: 'Build_linux_amd64'
236236
imageName: ubuntu22.04\test-deps
237-
artifactSuffix: ubuntu22.04_test_deps
237+
artifactSuffix: ubuntu2204_test_deps
238238
poolOS: 'linux'
239239
poolHostArchitecture: 'amd64'
240240
buildKitValue: 1

.vsts-ci/stableReleaseStage.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ stages:
8484
parameters:
8585
archName: 'Build_linux_amd64'
8686
imageName: ubuntu20.04
87-
artifactSuffix: ubuntu20.04
87+
artifactSuffix: ubuntu2004
8888
poolOS: 'linux'
8989
poolHostArchitecture: 'amd64'
9090
buildKitValue: 1
@@ -94,7 +94,7 @@ stages:
9494
parameters:
9595
archName: 'Build_linux_amd64'
9696
imageName: ubuntu22.04
97-
artifactSuffix: ubuntu22.04
97+
artifactSuffix: ubuntu2204
9898
poolOS: 'linux'
9999
poolHostArchitecture: 'amd64'
100100
buildKitValue: 1
@@ -104,7 +104,7 @@ stages:
104104
parameters:
105105
archName: 'Build_linux_arm32'
106106
imageName: ubuntu20.04-arm32v7
107-
artifactSuffix: ubuntu20.04_arm32v7
107+
artifactSuffix: ubuntu2004_arm32v7
108108
poolOS: 'linux'
109109
poolHostArchitecture: 'arm64'
110110
buildKitValue: 1
@@ -114,7 +114,7 @@ stages:
114114
parameters:
115115
archName: 'Build_linux_arm32'
116116
imageName: ubuntu22.04-arm32v7
117-
artifactSuffix: ubuntu22.04_arm32v7
117+
artifactSuffix: ubuntu2204_arm32v7
118118
poolOS: 'linux'
119119
poolHostArchitecture: 'arm64'
120120
buildKitValue: 1
@@ -224,7 +224,7 @@ stages:
224224
parameters:
225225
archName: 'Build_linux_amd64'
226226
imageName: ubuntu20.04\test-deps
227-
artifactSuffix: ubuntu20.04_test_deps
227+
artifactSuffix: ubuntu2004_test_deps
228228
poolOS: 'linux'
229229
poolHostArchitecture: 'amd64'
230230
buildKitValue: 1
@@ -234,7 +234,7 @@ stages:
234234
parameters:
235235
archName: 'Build_linux_amd64'
236236
imageName: ubuntu22.04\test-deps
237-
artifactSuffix: ubuntu22.04_test_deps
237+
artifactSuffix: ubuntu2204_test_deps
238238
poolOS: 'linux'
239239
poolHostArchitecture: 'amd64'
240240
buildKitValue: 1

tools/buildHelper/buildHelper.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ function Get-TemplatePopulatedYaml {
10801080
$sixSpace = " "*6
10811081

10821082
$imageName = $ImageInfo.Name
1083-
$artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_")
1083+
$artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_").Replace(".","")
10841084
$architecture = $ImageInfo.Architecture
10851085
$poolOS = $ImageInfo.IsLinux ? "linux" : "windows"
10861086
$archBasedJobName = "Build_$($poolOS)_$($architecture)"

0 commit comments

Comments
 (0)