From 6d3bd4cc0db5bdff1bdf747d0cc6522893b100cb Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:50:10 -0800 Subject: [PATCH] Parameterize test-pipeline version separator (#6409) Co-authored-by: Patrick Hallisey --- .../steps/set-test-pipeline-version.yml | 2 ++ eng/common/scripts/SetTestPipelineVersion.ps1 | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml b/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml index dee4e3834..61d49cdb7 100644 --- a/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml +++ b/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml @@ -2,6 +2,7 @@ parameters: PackageName: '' PackageNames: '' ServiceDirectory: '' + TagSeparator: '_' TestPipeline: false steps: @@ -16,4 +17,5 @@ steps: -BuildID $(Build.BuildId) -PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}' -ServiceDirectory '${{ parameters.ServiceDirectory }}' + -TagSeparator '${{ parameters.TagSeparator }}' pwsh: true diff --git a/eng/common/scripts/SetTestPipelineVersion.ps1 b/eng/common/scripts/SetTestPipelineVersion.ps1 index a24c011f8..2b2ee70ef 100644 --- a/eng/common/scripts/SetTestPipelineVersion.ps1 +++ b/eng/common/scripts/SetTestPipelineVersion.ps1 @@ -6,7 +6,9 @@ param ( [Parameter(mandatory = $true)] [string]$PackageNames, [Parameter(mandatory = $true)] - [string]$ServiceDirectory + [string]$ServiceDirectory, + [Parameter(mandatory = $false)] + [string]$TagSeparator = "_" ) . (Join-Path $PSScriptRoot common.ps1) @@ -20,23 +22,23 @@ $packageNamesArray = @() if ([String]::IsNullOrWhiteSpace($PackageNames)) { LogError "PackageNames cannot be empty." exit 1 -} else { +} +else { $packageNamesArray = $PackageNames.Split(',') } foreach ($packageName in $packageNamesArray) { Write-Host "Processing $packageName" $newVersion = [AzureEngSemanticVersion]::new("1.0.0") - $latestTags = git tag -l "${packageName}_*" + $prefix = "$packageName$TagSeparator" + Write-Host "Get Latest Tag : git tag -l $prefix*" + $latestTags = git tag -l "$prefix*" - Write-Host "Get Latest Tag : git tag -l ${packageName}_*" $semVars = @() - if ($latestTags -and ($latestTags.Length -gt 0)) - { - foreach ($tags in $latestTags) - { - $semVars += $tags.Replace("${packageName}_", "") + if ($latestTags -and ($latestTags.Length -gt 0)) { + foreach ($tag in $latestTags) { + $semVars += $tag.Substring($prefix.Length) } $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)