diff --git a/eng/common/pipelines/templates/steps/mark-release-completion.yml b/eng/common/pipelines/templates/steps/mark-release-completion.yml index 3f51a71ddc..91a39dc48c 100644 --- a/eng/common/pipelines/templates/steps/mark-release-completion.yml +++ b/eng/common/pipelines/templates/steps/mark-release-completion.yml @@ -1,6 +1,7 @@ parameters: ConfigFileDir: '' PackageArtifactName: '' + SourceRootPath: $(Build.SourcesDirectory) steps: - task: AzureCLI@2 @@ -8,7 +9,7 @@ steps: azureSubscription: opensource-api-connection scriptType: pscore scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/scripts/Mark-ReleasePlanCompletion.ps1 + scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Mark-ReleasePlanCompletion.ps1 arguments: -PackageInfoFilePath '${{ parameters.ConfigFileDir }}/${{ parameters.PackageArtifactName }}.json' workingDirectory: $(Pipeline.Workspace) displayName: Mark package as released diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index 439e58a89e..9bf29a72bd 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -1051,7 +1051,7 @@ function Get-ReleasePlanForPackage($packageName) $fieldList = ($fields | ForEach-Object { "[$_]"}) -join ", " $query = "SELECT ${fieldList} FROM WorkItems WHERE [Work Item Type] = 'Release Plan' AND [${packageNameFieldName}] = '${packageName}'" $query += " AND [${prStatusFieldName}] = 'merged'" - $query += " AND [System.State] IN ('In Progress') ORDER BY [System.CreatedDate]" + $query += " AND [System.State] IN ('In Progress')" $query += " AND [System.Tags] NOT CONTAINS 'Release Planner App Test'" $workItems = Invoke-Query $fields $query return $workItems