Update for PR test matrix (Azure#44081)

* Update for PR test matrix

* add PR to 'Initialize project list variable for PR test run' since this task is specific to PRs

* updates for feedback

* Update eng/pipelines/scripts/generate-project-list.ps1

committing suggestion

Co-authored-by: Wes Haggard <[email protected]>

* remove extra end }

---------

Co-authored-by: Wes Haggard <[email protected]>

Author: JimSuplizio

eng/pipelines/scripts/generate-project-list.ps1

@@ -2,6 +2,8 @@ $projectList = @()
 $artifactsList = @()
 $additionalModulesList = @()
 
+. "${PSScriptRoot}/../../common/scripts/common.ps1"
+
 if ($env:ARTIFACTSJSON -and $env:ARTIFACTSJSON -notlike '*ArtifactsJson*') {
   $artifacts = $env:ARTIFACTSJSON | ConvertFrom-Json
   foreach ($artifact in $artifacts) {
@@ -23,7 +25,29 @@ if ($env:ADDITIONALMODULESJSON -and $env:ADDITIONALMODULESJSON -notlike '*Additi
 # which means this is running as part of the pullrequest pipeline and the project list needs to
 # be figured out from the packageInfo files.
 if ($projectList.Length -eq 0 -and $ENV:PACKAGEINFODIR) {
-  [array]$packageInfoFiles = Get-ChildItem -Path $ENV:PACKAGEINFODIR "*.json"
+  # This is the case where this is being called as part of the set of test matrix runs.
+  # The ArtifactPackageNames environment variable will be set if this is being called
+  # as one of the test matrix runs. In this case, the project and additional modules lists
+  # need to be filtered by the ArtifactPackageNames otherwise there will be artifacts on
+  # the maven command line, for a matrix, that don't belong to the matrx if the PR has
+  # changes to multiple libraries that have different test matrices.
+  if (-not [string]::IsNullOrEmpty($ENV:ARTIFACTPACKAGENAMES)) {
+    Write-Host "ArtifactPackageNames is set to: $($ENV:ARTIFACTPACKAGENAMES)"
+    # The ArtifactPackageNames is a comma separated list
+    foreach ($artifactPackageName in $ENV:ARTIFACTPACKAGENAMES.Split(',')) {
+      # There should only be 1 PackageInfo file for each ArtifactPackageName.
+      [array]$packageInfoFiles = Get-ChildItem -Path $ENV:PACKAGEINFODIR "$($artifactPackageName).json"
+      if ($packageInfoFiles) {
+        if ($packageInfoFiles.Length -gt 1) {
+          LogWarning "Multiple PackageInfo files found for $artifactPackageName, using the first one."
+        }
+      } else {
+        LogError "No PackageInfo file found for $artifactPackageName"
+      }
+    }
+  } else {
+    [array]$packageInfoFiles = Get-ChildItem -Path $ENV:PACKAGEINFODIR "*.json"
+  }
   foreach($packageInfoFile in $packageInfoFiles) {
     $packageInfoJson = Get-Content $packageInfoFile -Raw
     $packageInfo = ConvertFrom-Json $packageInfoJson

eng/pipelines/templates/steps/generate-project-list-and-cache-maven-repository.yml

@@ -33,10 +33,15 @@ steps:
       ServiceDirectory: ${{parameters.ServiceDirectory}}
       ExcludePaths: ${{parameters.ExcludePaths}}
 
-  # Create the ProjectList and ProjectListSha256 variables.
-  # The ProjectList is used by subsequent steps and tasks to run CI.
-  # The ProjectListSha256 is used by the cache key, previously the cache key was using ProjectList but it was found
-  # that long cache keys cause caching to fail.
+# Create the ProjectList and ProjectListSha256 variables.
+# The ProjectList is used by subsequent steps and tasks to run CI.
+# The ProjectListSha256 is used by the cache key, previously the cache key was using ProjectList but it was found
+# that long cache keys cause caching to fail.
+
+# ArtifactPackageNames is set by the generate test matrix and is only set for test runs. This needs to be
+# used to correctly set the project list and additional modules for what should be running for this particular
+# matrix run. The reason for this is that different service directories, like clientcore, have their own
+# default test matrix as compared to something like azure-template, which uses the default test matrix
 - task: PowerShell@2
   displayName: Initialize project list variable
   inputs:
@@ -46,6 +51,19 @@ steps:
     ARTIFACTSJSON: $(ArtifactsJson)
     ADDITIONALMODULESJSON: $(AdditionalModulesJson)
     PACKAGEINFODIR: $(Build.ArtifactStagingDirectory)/PackageInfo
+  condition: eq(variables['ArtifactPackageNames'], '')
+
+- task: PowerShell@2
+  displayName: Initialize project list variable for PR test run
+  inputs:
+    pwsh: true
+    filePath: eng/pipelines/scripts/generate-project-list.ps1
+  env:
+    ARTIFACTSJSON: $(ArtifactsJson)
+    ADDITIONALMODULESJSON: $(AdditionalModulesJson)
+    PACKAGEINFODIR: $(Build.ArtifactStagingDirectory)/PackageInfo
+    ARTIFACTPACKAGENAMES: $(ArtifactPackageNames)
+  condition: ne(variables['ArtifactPackageNames'], '')
 
 # The Cache task, when restoring, can have a miss and still pass but, if nothing is built, the
 # Post-Job Cache will fail because there's no .m2/repository