- Fixed Azure package pipelines to support pools in the ADO.Net and Public projects.

Author: paulmedynski

eng/pipelines/jobs/test-azure-package-ci-job.yml

@@ -269,9 +269,9 @@ jobs:
           displayName: Test [${{ runtime }}]
           env:
             # Many of our tests require access to Azure resources that are
-            # currently only granted by agents running our custom ADO-CI 1ES
-            # images in our ADO pool.
-            ${{ if startsWith(parameters.poolName, 'ADO-CI') }}:
+            # currently only granted by agents running our custom ADO 1ES
+            # images in our ADO pools.
+            ${{ if startsWith(parameters.poolName, 'ADO-') }}:
               ADO_POOL: 1
             # When using connectedServiceName below, the DotNetCoreCLI task
             # needs the system access token to be injected as this environment

eng/pipelines/stages/build-azure-package-ci-stage.yml

@@ -38,6 +38,19 @@ parameters:
   - name: abstractionsPackageVersion
     type: string
 
+  # The name of the pool to use for jobs that require customized VM images.
+  - name: adoPoolName
+    type: string
+    # This variable should be defined in AzureDevOps Library variable groups,
+    # for both the Public and ADO.Net projects.
+    #
+    # Any pool specified here must contain images with the following names:
+    #
+    #   - ADO-UB22-SQL22
+    #   - ADO-CI-Win11
+    #
+    default: $(ci_var_defaultPoolName)
+
   # The name of the pipeline artifact to publish.
   - name: azureArtifactName
     type: string
@@ -47,6 +60,12 @@ parameters:
   - name: azurePackageVersion
     type: string
 
+  # The name of the general Azure pool to use for jobs that don't require
+  # customized VM images.
+  - name: azurePoolName
+    type: string
+    default: Azure Pipelines
+
   # The type of build to produce (Release or Debug)
   - name: buildConfiguration
     type: string
@@ -126,11 +145,11 @@ stages:
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0]
-          poolName: Azure Pipelines
+          poolName: ${{ parameters.azurePoolName }}
           referenceType: ${{ parameters.referenceType }}
           vmImage: ubuntu-latest
 
-      # Use our 1ES ADO-CI pool for comprehensive testing.
+      # Use our 1ES ADO pool for comprehensive testing.
       - template: ../jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactName: ${{ parameters.abstractionsArtifactName }}
@@ -144,7 +163,7 @@ stages:
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0]
-          poolName: ADO-CI-1ES-Pool
+          poolName: ${{ parameters.adoPoolName }}
           referenceType: ${{ parameters.referenceType }}
           vmImage: ADO-UB22-SQL22
 
@@ -165,11 +184,11 @@ stages:
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0]
-          poolName: Azure Pipelines
+          poolName: ${{ parameters.azurePoolName }}
           referenceType: ${{ parameters.referenceType }}
           vmImage: windows-latest
 
-      # Use our 1ES ADO-CI pool for comprehensive testing.
+      # Use our 1ES ADO pool for comprehensive testing.
       - template: ../jobs/test-azure-package-ci-job.yml@self
         parameters:
           abstractionsArtifactName: ${{ parameters.abstractionsArtifactName }}
@@ -183,7 +202,7 @@ stages:
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           netFrameworkRuntimes: [net462]
           netRuntimes: [net8.0, net9.0]
-          poolName: ADO-CI-1ES-Pool
+          poolName: ${{ parameters.adoPoolName }}
           referenceType: ${{ parameters.referenceType }}
           vmImage: ADO-CI-Win11
 
@@ -204,11 +223,11 @@ stages:
           mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
           netFrameworkRuntimes: []
           netRuntimes: [net8.0, net9.0]
-          poolName: Azure Pipelines
+          poolName: ${{ parameters.azurePoolName }}
           referenceType: ${{ parameters.referenceType }}
           vmImage: macos-latest
 
-      # We do not currently have any images in our 1ES ADO-CI pool for macOS.
+      # We do not currently have any images in our 1ES ADO pools for macOS.
 
       # ------------------------------------------------------------------------
       # Create and publish the NuGet package.