diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml index 17f27ee32725c..2e10f695c9987 100644 --- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml +++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml @@ -1,19 +1,7 @@ # This script fragment is used across our repos to set a variable "SetDevVersion" which # is used when this pipeline is going to be generating and publishing daily dev builds. -parameters: - ServiceDirectory: '' + steps: -- ${{if ne(parameters.ServiceDirectory, '')}}: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 - arguments: > - -ServiceDirectory ${{parameters.ServiceDirectory}} - -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo - pwsh: true - workingDirectory: $(Pipeline.Workspace) - displayName: Dump Package properties - condition: succeeded() - pwsh: | $setDailyDevBuild = "false" if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) { diff --git a/eng/common/scripts/Create-APIReview.ps1 b/eng/common/scripts/Create-APIReview.ps1 index 210b82d4f69bc..91fccacc12987 100644 --- a/eng/common/scripts/Create-APIReview.ps1 +++ b/eng/common/scripts/Create-APIReview.ps1 @@ -40,7 +40,6 @@ function Submit-APIReview($packagename, $filePath, $uri, $apiKey, $apiLabel) try { $Response = Invoke-WebRequest -Method 'POST' -Uri $uri -Body $multipartContent -Headers $headers - Write-Host "API Review: $($Response)" $StatusCode = $Response.StatusCode } catch @@ -82,47 +81,23 @@ else } $FoundFailure = $False -$pkgInfoPath = Join-Path -Path $ArtifactPath "PackageInfo" foreach ($pkgName in $responses.Keys) { $respCode = $responses[$pkgName] if ($respCode -ne '200') { - $pkgPropPath = Join-Path -Path $pkgInfoPath ($PackageName + ".json") - if (-Not (Test-Path $pkgPropPath)) + $FoundFailure = $True + if ($respCode -eq '201') { - Write-Host " Package property file path $($pkgPropPath) is invalid." - $FoundFailure = $True + Write-Host "API Review is pending for package $pkgName" } else { - $pkgInfo = Get-Content $pkgPropPath | ConvertFrom-Json - $version = [AzureEngSemanticVersion]::ParseVersionString($pkgInfo.Version) - if ($version.IsPrerelease) - { - Write-Host "Package version is not GA. Ignoring API view approval status" - } - elseif ($pkgInfo.SdkType -eq "client" -and $pkgInfo.IsNewSdk) - { - $FoundFailure = $True - if ($respCode -eq '201') - { - Write-Error "Automatic API Review approval is pending for package $($PackageName)" - } - else - { - Write-Error "Failed to create API Review for package $($PackageName)" - } - } - else - { - Write-Host "API review is not approved for package $($PackageName). Management and track1 package can be released without API review approval." - } + Write-Host "Failed to create API Review for package $pkgName" } } } if ($FoundFailure) { - Write-Error "Automatic API review is not yet approved for package $($PackageName)" - exit 1 + Write-Host "Atleast one API review is not yet approved" } diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1 index f582a4a74dcf2..c1daf77b3b36d 100644 --- a/eng/common/scripts/Package-Properties.ps1 +++ b/eng/common/scripts/Package-Properties.ps1 @@ -10,8 +10,6 @@ class PackageProps [string]$ReadMePath [string]$ChangeLogPath [string]$Group - [string]$SdkType - [boolean]$IsNewSdk PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory) { diff --git a/eng/common/scripts/Save-Package-Properties.ps1 b/eng/common/scripts/Save-Package-Properties.ps1 deleted file mode 100644 index b78e3342efe0b..0000000000000 --- a/eng/common/scripts/Save-Package-Properties.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -[CmdletBinding()] -Param ( - [Parameter(Mandatory=$True)] - [string] $serviceDirectory, - [Parameter(Mandatory=$True)] - [string] $outDirectory -) - -. (Join-Path $PSScriptRoot common.ps1) -$allPackageProperties = Get-AllPkgProperties $serviceDirectory -if ($allPackageProperties) -{ - New-Item -ItemType Directory -Force -Path $outDirectory - foreach($pkg in $allPackageProperties) - { - if ($pkg.IsNewSDK) - { - Write-Host "Package Name: $($pkg.Name)" - Write-Host "Package Version: $($pkg.Version)" - Write-Host "Package SDK Type: $($pkg.SdkType)" - $outputPath = Join-Path -Path $outDirectory ($pkg.Name + ".json") - $outputObject = $pkg | ConvertTo-Json - Set-Content -Path $outputPath -Value $outputObject - } - } - - Get-ChildItem -Path $outDirectory -} -else -{ - Write-Error "Package properties are not available for service directory $($serviceDirectory)" - exit 1 -} -