diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 28407fb72..d67e4b697 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,19 +85,19 @@ stages: parameters: # Exclude managed-identity E2E tests: they require an MI assigned to the # host (IMDS), which Microsoft-hosted agents do not have. They run in the - # ManagedIdentityE2E stage below on the MSALMSIV2 VM pool. + # ManagedIdentityE2E stage below on the MISEManagedIdentity VM pool. e2eTestFilterCriteria: 'Category!=MI_E2E' # Managed-identity E2E tests require a VM with an assigned managed identity (IMDS), -# which Microsoft-hosted agents do not have. They run on the MSALMSIV2 VM pool and +# which Microsoft-hosted agents do not have. They run on the MISEManagedIdentity VM pool and # build only the E2E project (.NET 8), independent of the Build stage. - stage: ManagedIdentityE2E - displayName: 'Managed Identity E2E (MSALMSIV2)' + displayName: 'Managed Identity E2E (MISEManagedIdentity)' dependsOn: [] jobs: - job: ManagedIdentityE2E pool: - name: 'MSALMSIV2' + name: 'MISEManagedIdentity' steps: - template: build/template-run-managed-identity-e2e-tests.yaml parameters: diff --git a/build/template-run-managed-identity-e2e-tests.yaml b/build/template-run-managed-identity-e2e-tests.yaml index e364f6716..754252e62 100644 --- a/build/template-run-managed-identity-e2e-tests.yaml +++ b/build/template-run-managed-identity-e2e-tests.yaml @@ -1,7 +1,7 @@ # template-run-managed-identity-e2e-tests.yaml # Build the TokenAcquirer E2E project (.NET 8 only) and run the managed-identity # E2E tests (Category=MI_E2E). These require a VM with an assigned managed -# identity (IMDS), so they run on the MSALMSIV2 pool, not Microsoft-hosted agents. +# identity (IMDS), so they run on the MISEManagedIdentity pool, not Microsoft-hosted agents. # Mirrors the MSAL.NET template-run-mi-e2e-imds.yaml approach. parameters: @@ -35,7 +35,7 @@ steps: - task: VSTest@2 displayName: 'Run managed identity E2E tests' - # This template runs on the MSALMSIV2 pool; override the UAMI client id to the + # This template runs on the MISEManagedIdentity pool; override the UAMI client id to the # msiv2uami identity assigned to that pool. Other pipelines (e.g. id4s-official # on the Wilson pool) leave this unset and fall back to the default in the test. env: diff --git a/build/template-test-e2e.yaml b/build/template-test-e2e.yaml index 5ebb082c5..9977cb2c1 100644 --- a/build/template-test-e2e.yaml +++ b/build/template-test-e2e.yaml @@ -5,7 +5,7 @@ parameters: # VSTest filter applied to the E2E run. Empty by default so the release build runs # the full suite. The PR build passes 'Category!=MI_E2E' to exclude managed-identity -# tests, which run on the MSALMSIV2 pool in their own stage. +# tests, which run on the MISEManagedIdentity pool in their own stage. - name: e2eTestFilterCriteria type: string default: '' diff --git a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirer.cs b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirer.cs index 59cb87056..79b918d2f 100644 --- a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirer.cs +++ b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirer.cs @@ -562,7 +562,7 @@ public async Task AcquireTokenWithManagedIdentity_UserAssignedAsync() const string scope = "https://vault.azure.net/.default"; const string baseUrl = "https://vault.azure.net"; // UAMI client id depends on the build pool: pipelines running on the - // MSALMSIV2 pool set IDWEB_MI_UAMI_CLIENTID to "msiv2uami" (6325cd32, + // MISEManagedIdentity pool set IDWEB_MI_UAMI_CLIENTID to "msiv2uami" (6325cd32, // RG MSIV2-Testing-MSALNET). Fallback is "Msal_Integration_tests" // (45344e7d, RG MSAL_MSI) assigned to the Wilson pool used by the // id4s-official pipeline. Both are sub c1686c51-b717-4fe0-9af3-24a20a41fb0c.