Skip to content

Commit

Permalink
Remove filtering based on ci.yml
Browse files Browse the repository at this point in the history
Given service bus is not in ci.yml but in ci.data.yml
the filtering currently excludes it from the project properties.

This commit is a temporary fix to unblock a current release and
shouldn't be merged into master. A more tested fix will be needed
from our eng/common workflow for the long-term fix.
  • Loading branch information
weshaggard committed Apr 19, 2021
1 parent 3450eef commit 3191e94
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions eng/common/scripts/Package-Properties.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class PackageProps
if (Test-Path (Join-Path $directoryPath "README.md"))
{
$this.ReadMePath = Join-Path $directoryPath "README.md"
}
}
else
{
$this.ReadMePath = $null
Expand All @@ -48,7 +48,7 @@ class PackageProps
if (Test-Path (Join-Path $directoryPath "CHANGELOG.md"))
{
$this.ChangeLogPath = Join-Path $directoryPath "CHANGELOG.md"
}
}
else
{
$this.ChangeLogPath = $null
Expand Down Expand Up @@ -114,7 +114,7 @@ function Get-AllPkgProperties ([string]$ServiceDirectory = $null)
{
$pkgPropsResult += Get-PkgPropsForEntireService -serviceDirectoryPath $dir.FullName
}
}
}
else
{
$pkgPropsResult = Get-PkgPropsForEntireService -serviceDirectoryPath (Join-Path $RepoRoot "sdk" $ServiceDirectory)
Expand All @@ -124,7 +124,7 @@ function Get-AllPkgProperties ([string]$ServiceDirectory = $null)
return $pkgPropsResult
}

# Given the metadata url under https://github.com/Azure/azure-sdk/tree/master/_data/releases/latest,
# Given the metadata url under https://github.com/Azure/azure-sdk/tree/master/_data/releases/latest,
# the function will return the csv metadata back as part of response.
function Get-CSVMetadata ([string]$MetadataUri=$MetadataUri)
{
Expand Down Expand Up @@ -155,17 +155,7 @@ function Get-PkgPropsForEntireService ($serviceDirectoryPath)
}
}

$ciYmlFiles = Get-ChildItem $serviceDirectoryPath -filter "ci.yml"
foreach($ciYmlFile in $ciYmlFiles)
{
$activeArtifactList = Get-ArtifactListFromYml -ciYmlPath $ciYmlFile.FullName
foreach ($artifact in $activeArtifactList)
{
$packageProps += $projectProps | Where-Object { $_.ArtifactName -eq $artifact["name"] -and $_.Group -eq $artifact["groupId"] }
}
}

return $packageProps
return $projectProps
}

function Get-ArtifactListFromYml ($ciYmlPath)
Expand All @@ -187,7 +177,7 @@ function Get-ArtifactListFromYml ($ciYmlPath)
{
$artifactsInCI = $ciYmlObj["stages"][0]["parameters"]["Artifacts"]
}
elseif ($ciYmlObj.Contains("extends"))
elseif ($ciYmlObj.Contains("extends"))
{
$artifactsInCI = $ciYmlObj["extends"]["parameters"]["Artifacts"]
}
Expand Down

0 comments on commit 3191e94

Please sign in to comment.