Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .vsts-ci/ltsReleaseStage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04
artifactSuffix: ubuntu20.04
artifactSuffix: ubuntu2004
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -74,7 +74,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04
artifactSuffix: ubuntu22.04
artifactSuffix: ubuntu2204
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -84,7 +84,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu20.04-arm32v7
artifactSuffix: ubuntu20.04_arm32v7
artifactSuffix: ubuntu2004_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand All @@ -94,7 +94,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu22.04-arm32v7
artifactSuffix: ubuntu22.04_arm32v7
artifactSuffix: ubuntu2204_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand Down Expand Up @@ -194,7 +194,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu20.04_test_deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -204,7 +204,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu22.04_test_deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand Down
12 changes: 6 additions & 6 deletions .vsts-ci/previewReleaseStage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04
artifactSuffix: ubuntu20.04
artifactSuffix: ubuntu2004
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -94,7 +94,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04
artifactSuffix: ubuntu22.04
artifactSuffix: ubuntu2204
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -104,7 +104,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu20.04-arm32v7
artifactSuffix: ubuntu20.04_arm32v7
artifactSuffix: ubuntu2004_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand All @@ -114,7 +114,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu22.04-arm32v7
artifactSuffix: ubuntu22.04_arm32v7
artifactSuffix: ubuntu2204_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand Down Expand Up @@ -224,7 +224,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu20.04_test_deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -234,7 +234,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu22.04_test_deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand Down
12 changes: 6 additions & 6 deletions .vsts-ci/stableReleaseStage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04
artifactSuffix: ubuntu20.04
artifactSuffix: ubuntu2004
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -94,7 +94,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04
artifactSuffix: ubuntu22.04
artifactSuffix: ubuntu2204
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -104,7 +104,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu20.04-arm32v7
artifactSuffix: ubuntu20.04_arm32v7
artifactSuffix: ubuntu2004_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand All @@ -114,7 +114,7 @@ stages:
parameters:
archName: 'Build_linux_arm32'
imageName: ubuntu22.04-arm32v7
artifactSuffix: ubuntu22.04_arm32v7
artifactSuffix: ubuntu2204_arm32v7
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
Expand Down Expand Up @@ -224,7 +224,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu20.04_test_deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -234,7 +234,7 @@ stages:
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu22.04_test_deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand Down
2 changes: 1 addition & 1 deletion tools/buildHelper/buildHelper.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ function Get-TemplatePopulatedYaml {
$sixSpace = " "*6

$imageName = $ImageInfo.Name
$artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_")
$artifactSuffix = $ImageInfo.Name.ToString().Replace("\", "_").Replace("-","_").Replace(".","")
$architecture = $ImageInfo.Architecture
$poolOS = $ImageInfo.IsLinux ? "linux" : "windows"
$archBasedJobName = "Build_$($poolOS)_$($architecture)"
Expand Down