From 7bf7ddb589171a80c65c64958f6bd6fbaaa5c1a2 Mon Sep 17 00:00:00 2001 From: Anam Navied Date: Wed, 24 Apr 2024 18:37:36 -0400 Subject: [PATCH] artifactSuffix is used to create jobName in build and thus cant have period in it --- .vsts-ci/ltsReleaseStage.yml | 12 ++++++------ .vsts-ci/previewReleaseStage.yml | 12 ++++++------ .vsts-ci/stableReleaseStage.yml | 12 ++++++------ tools/buildHelper/buildHelper.psm1 | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.vsts-ci/ltsReleaseStage.yml b/.vsts-ci/ltsReleaseStage.yml index d911820c9..41c10e618 100644 --- a/.vsts-ci/ltsReleaseStage.yml +++ b/.vsts-ci/ltsReleaseStage.yml @@ -64,7 +64,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu20.04 - artifactSuffix: ubuntu20.04 + artifactSuffix: ubuntu2004 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -74,7 +74,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu22.04 - artifactSuffix: ubuntu22.04 + artifactSuffix: ubuntu2204 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.vsts-ci/previewReleaseStage.yml b/.vsts-ci/previewReleaseStage.yml index 631177296..39c96e06b 100644 --- a/.vsts-ci/previewReleaseStage.yml +++ b/.vsts-ci/previewReleaseStage.yml @@ -84,7 +84,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu20.04 - artifactSuffix: ubuntu20.04 + artifactSuffix: ubuntu2004 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -94,7 +94,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu22.04 - artifactSuffix: ubuntu22.04 + artifactSuffix: ubuntu2204 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.vsts-ci/stableReleaseStage.yml b/.vsts-ci/stableReleaseStage.yml index d16a86ff2..7bc0619a6 100644 --- a/.vsts-ci/stableReleaseStage.yml +++ b/.vsts-ci/stableReleaseStage.yml @@ -84,7 +84,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu20.04 - artifactSuffix: ubuntu20.04 + artifactSuffix: ubuntu2004 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -94,7 +94,7 @@ stages: parameters: archName: 'Build_linux_amd64' imageName: ubuntu22.04 - artifactSuffix: ubuntu22.04 + artifactSuffix: ubuntu2204 poolOS: 'linux' poolHostArchitecture: 'amd64' buildKitValue: 1 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tools/buildHelper/buildHelper.psm1 b/tools/buildHelper/buildHelper.psm1 index 85bc26d1b..92577635b 100644 --- a/tools/buildHelper/buildHelper.psm1 +++ b/tools/buildHelper/buildHelper.psm1 @@ -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)"