Skip to content

Commit 54682bc

Browse files
Sync eng/common directory with azure-sdk-tools for PR 7989 (#35040)
* Remove soft errors in validation step from Devops pipeline * update artifact name --------- Co-authored-by: Praveen Kuttappan <[email protected]>
1 parent 5bbef7e commit 54682bc

File tree

2 files changed

+34
-11
lines changed

2 files changed

+34
-11
lines changed

eng/common/scripts/ChangeLog-Operations.ps1

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ function Confirm-ChangeLogEntry {
142142
[PSCustomObject]$ChangeLogStatus = $null
143143
)
144144

145+
$suppressErrors = $false
145146
if (!$ChangeLogStatus) {
146147
$ChangeLogStatus = [PSCustomObject]@{
147148
IsValid = $false
@@ -150,15 +151,17 @@ function Confirm-ChangeLogEntry {
150151
}
151152
else {
152153
# Do not stop the script on error when status object is passed as param
153-
$ErrorActionPreference = 'Continue'
154+
$suppressErrors = $true
154155
}
155156
$changeLogEntries = Get-ChangeLogEntries -ChangeLogLocation $ChangeLogLocation
156157
$changeLogEntry = $changeLogEntries[$VersionString]
157158

158159
if (!$changeLogEntry) {
159160
$ChangeLogStatus.Message = "ChangeLog[${ChangeLogLocation}] does not have an entry for version ${VersionString}."
160161
$ChangeLogStatus.IsValid = $false
161-
LogError "$($ChangeLogStatus.Message)"
162+
if (!$suppressErrors) {
163+
LogError "$($ChangeLogStatus.Message)"
164+
}
162165
return $false
163166
}
164167

@@ -176,7 +179,9 @@ function Confirm-ChangeLogEntry {
176179
if ([System.String]::IsNullOrEmpty($changeLogEntry.ReleaseStatus)) {
177180
$ChangeLogStatus.Message = "Entry does not have a release status. Please ensure the status is set to a date '($CHANGELOG_DATE_FORMAT)' or '$CHANGELOG_UNRELEASED_STATUS' if not yet released. See https://aka.ms/azsdk/guideline/changelogs for more info."
178181
$ChangeLogStatus.IsValid = $false
179-
LogError "$($ChangeLogStatus.Message)"
182+
if (!$suppressErrors) {
183+
LogError "$($ChangeLogStatus.Message)"
184+
}
180185
return $false
181186
}
182187

@@ -359,19 +364,25 @@ function Confirm-ChangeLogForRelease {
359364
$ChangeLogStatus = $null
360365
)
361366

367+
$suppressErrors = $false
362368
if (!$ChangeLogStatus) {
363369
$ChangeLogStatus = [PSCustomObject]@{
364370
IsValid = $false
365371
Message = ""
366372
}
367373
}
374+
else {
375+
$suppressErrors = $true
376+
}
368377
$entries = Sort-ChangeLogEntries -changeLogEntries $changeLogEntries
369378

370379
$ChangeLogStatus.IsValid = $true
371380
if ($changeLogEntry.ReleaseStatus -eq $CHANGELOG_UNRELEASED_STATUS) {
372381
$ChangeLogStatus.Message = "Entry has no release date set. Please ensure to set a release date with format '$CHANGELOG_DATE_FORMAT'. See https://aka.ms/azsdk/guideline/changelogs for more info."
373382
$ChangeLogStatus.IsValid = $false
374-
LogError "$($ChangeLogStatus.Message)"
383+
if (!$suppressErrors) {
384+
LogError "$($ChangeLogStatus.Message)"
385+
}
375386
}
376387
else {
377388
$status = $changeLogEntry.ReleaseStatus.Trim().Trim("()")
@@ -381,27 +392,35 @@ function Confirm-ChangeLogForRelease {
381392
{
382393
$ChangeLogStatus.Message = "Date must be in the format $($CHANGELOG_DATE_FORMAT). See https://aka.ms/azsdk/guideline/changelogs for more info."
383394
$ChangeLogStatus.IsValid = $false
384-
LogError "$($ChangeLogStatus.Message)"
395+
if (!$suppressErrors) {
396+
LogError "$($ChangeLogStatus.Message)"
397+
}
385398
}
386399

387400
if (@($entries.ReleaseStatus)[0] -ne $changeLogEntry.ReleaseStatus)
388401
{
389402
$ChangeLogStatus.Message = "Invalid date [ $status ]. The date for the changelog being released must be the latest in the file."
390403
$ChangeLogStatus.IsValid = $false
391-
LogError "$($ChangeLogStatus.Message)"
404+
if (!$suppressErrors) {
405+
LogError "$($ChangeLogStatus.Message)"
406+
}
392407
}
393408
}
394409
catch {
395410
$ChangeLogStatus.Message = "Invalid date [ $status ] passed as status for Version [$($changeLogEntry.ReleaseVersion)]. See https://aka.ms/azsdk/guideline/changelogs for more info."
396411
$ChangeLogStatus.IsValid = $false
397-
LogError "$($ChangeLogStatus.Message)"
412+
if (!$suppressErrors) {
413+
LogError "$($ChangeLogStatus.Message)"
414+
}
398415
}
399416
}
400417

401418
if ([System.String]::IsNullOrWhiteSpace($changeLogEntry.ReleaseContent)) {
402419
$ChangeLogStatus.Message = "Entry has no content. Please ensure to provide some content of what changed in this version. See https://aka.ms/azsdk/guideline/changelogs for more info."
403420
$ChangeLogStatus.IsValid = $false
404-
LogError "$($ChangeLogStatus.Message)"
421+
if (!$suppressErrors) {
422+
LogError "$($ChangeLogStatus.Message)"
423+
}
405424
}
406425

407426
$foundRecommendedSection = $false
@@ -422,12 +441,16 @@ function Confirm-ChangeLogForRelease {
422441
{
423442
$ChangeLogStatus.Message = "The changelog entry has the following sections with no content ($($emptySections -join ', ')). Please ensure to either remove the empty sections or add content to the section."
424443
$ChangeLogStatus.IsValid = $false
425-
LogError "$($ChangeLogStatus.Message)"
444+
if (!$suppressErrors) {
445+
LogError "$($ChangeLogStatus.Message)"
446+
}
426447
}
427448
if (!$foundRecommendedSection)
428449
{
429450
$ChangeLogStatus.Message = "The changelog entry did not contain any of the recommended sections ($($RecommendedSectionHeaders -join ', ')), please add at least one. See https://aka.ms/azsdk/guideline/changelogs for more info."
430-
LogWarning "$($ChangeLogStatus.Message)"
451+
if (!$suppressErrors) {
452+
LogError "$($ChangeLogStatus.Message)"
453+
}
431454
}
432455
return $ChangeLogStatus.IsValid
433456
}

eng/common/scripts/Create-APIReview.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function Submit-APIReview($packageInfo, $packagePath, $packageArtifactName)
149149
$reviewTokenFileName = Get-APITokenFileName $packageArtifactName
150150
if ($reviewTokenFileName) {
151151
Write-Host "Uploading review token file $reviewTokenFileName to APIView."
152-
return Upload-ReviewTokenFile $packageName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
152+
return Upload-ReviewTokenFile $packageArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
153153
}
154154
else {
155155
Write-Host "Uploading $packagePath to APIView."

0 commit comments

Comments
 (0)