Skip to content

Make sure daily release tag does not change when retrying failures #15286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 6 commits into from
Apr 22, 2021
Merged

Make sure daily release tag does not change when retrying failures #15286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
854a575
fix issue with counter changing
TravisEz13 Apr 20, 2021
141d14e
fix download issue
TravisEz13 Apr 20, 2021
85a8d02
fix substitution
TravisEz13 Apr 20, 2021
22105d8
fix download path
TravisEz13 Apr 20, 2021
833621c
fix logic on when to create json
TravisEz13 Apr 20, 2021
7a3d542
Update tools/releaseBuild/setReleaseTag.ps1
TravisEz13 Apr 21, 2021
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
11 changes: 10 additions & 1 deletion tools/releaseBuild/azureDevOps/templates/SetVersionVariables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@ parameters:
ReleaseTagVar: v6.2.0
ReleaseTagVarName: ReleaseTagVar
CreateJson: 'no'
UseJson: 'yes'

steps:
- ${{ if eq(parameters['UseJson'],'yes') }}:
- task: DownloadBuildArtifacts@0
inputs:
artifactName: 'BuildInfoJson'
itemPattern: '**/*.json'
downloadPath: '$(System.ArtifactsDirectory)'
displayName: Download Build Info Json

- powershell: |
$path = "./build.psm1"

Expand All @@ -25,7 +34,7 @@ steps:
displayName: 'Set repo Root'

- powershell: |
$createJson = ("${{ parameters.ReleaseTagVarName }}" -ne "no")
$createJson = ("${{ parameters.CreateJson }}" -ne "no")
Copy link
Copy Markdown
Member Author

@TravisEz13 TravisEz13 Apr 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a pre-existing issue I noticed when verifying the fix.

$releaseTag = & "$env:REPOROOT/tools/releaseBuild/setReleaseTag.ps1" -ReleaseTag ${{ parameters.ReleaseTagVar }} -Variable "${{ parameters.ReleaseTagVarName }}" -CreateJson:$createJson
$version = $releaseTag.Substring(1)
$vstsCommandString = "vso[task.setvariable variable=Version]$version"
Expand Down
3 changes: 3 additions & 0 deletions tools/releaseBuild/azureDevOps/templates/checkAzureContainer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ jobs:
steps:
- checkout: self
clean: true

- template: SetVersionVariables.yml
parameters:
ReleaseTagVar: $(ReleaseTagVar)
CreateJson: yes
UseJson: no

- task: AzurePowerShell@4
inputs:
Expand Down
22 changes: 15 additions & 7 deletions tools/releaseBuild/setReleaseTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,23 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
{
$isDaily = $true
Write-Verbose "daily build" -Verbose
$metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'
$metadata = Get-Content $metaDataJsonPath | ConvertFrom-Json
$versionPart = $metadata.PreviewReleaseTag
if($versionPart -match '-.*$')
{
$versionPart = $versionPart -replace '-.*$'
$jsonPath = "${env:SYSTEM_ARTIFACTSDIRECTORY}\BuildInfoJson\daily.json"
if (test-path -Path $jsonPath) {
Write-Verbose "restoring from buildinfo json..." -Verbose
$buildInfo = Get-Content -Path $jsonPath | ConvertFrom-Json
$releaseTag = $buildInfo.ReleaseTag
} else {
Write-Verbose "creating from branch counter and metadata.json..." -Verbose
$metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'
$metadata = Get-Content $metaDataJsonPath | ConvertFrom-Json
$versionPart = $metadata.PreviewReleaseTag
if ($versionPart -match '-.*$') {
$versionPart = $versionPart -replace '-.*$'
}

$releaseTag = "$versionPart-daily$((Get-Date).ToString('yyyyMMdd')).$($env:BRANCHCOUNTER)"
}

$releaseTag = "$versionPart-daily$((Get-Date).ToString('yyyyMMdd')).$($env:BRANCHCOUNTER)"
$vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
Write-Host -Object "##$vstsCommandString"
Expand Down