Skip to content

Commit 910aea0

Browse files
azure-sdkhallipr
andauthored
Parameterize test-pipeline version separator (Azure#39666)
Co-authored-by: Patrick Hallisey <[email protected]>
1 parent b2aa265 commit 910aea0

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

eng/common/pipelines/templates/steps/set-test-pipeline-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ parameters:
22
PackageName: ''
33
PackageNames: ''
44
ServiceDirectory: ''
5+
TagSeparator: '_'
56
TestPipeline: false
67

78
steps:
@@ -16,4 +17,5 @@ steps:
1617
-BuildID $(Build.BuildId)
1718
-PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}'
1819
-ServiceDirectory '${{ parameters.ServiceDirectory }}'
20+
-TagSeparator '${{ parameters.TagSeparator }}'
1921
pwsh: true

eng/common/scripts/SetTestPipelineVersion.ps1

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ param (
66
[Parameter(mandatory = $true)]
77
[string]$PackageNames,
88
[Parameter(mandatory = $true)]
9-
[string]$ServiceDirectory
9+
[string]$ServiceDirectory,
10+
[Parameter(mandatory = $false)]
11+
[string]$TagSeparator = "_"
1012
)
1113

1214
. (Join-Path $PSScriptRoot common.ps1)
@@ -20,23 +22,23 @@ $packageNamesArray = @()
2022
if ([String]::IsNullOrWhiteSpace($PackageNames)) {
2123
LogError "PackageNames cannot be empty."
2224
exit 1
23-
} else {
25+
}
26+
else {
2427
$packageNamesArray = $PackageNames.Split(',')
2528
}
2629

2730
foreach ($packageName in $packageNamesArray) {
2831
Write-Host "Processing $packageName"
2932
$newVersion = [AzureEngSemanticVersion]::new("1.0.0")
30-
$latestTags = git tag -l "${packageName}_*"
33+
$prefix = "$packageName$TagSeparator"
34+
Write-Host "Get Latest Tag : git tag -l $prefix*"
35+
$latestTags = git tag -l "$prefix*"
3136

32-
Write-Host "Get Latest Tag : git tag -l ${packageName}_*"
3337
$semVars = @()
3438

35-
if ($latestTags -and ($latestTags.Length -gt 0))
36-
{
37-
foreach ($tags in $latestTags)
38-
{
39-
$semVars += $tags.Replace("${packageName}_", "")
39+
if ($latestTags -and ($latestTags.Length -gt 0)) {
40+
foreach ($tag in $latestTags) {
41+
$semVars += $tag.Substring($prefix.Length)
4042
}
4143

4244
$semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)

0 commit comments

Comments
 (0)