From 89dd1c0de3cc40e9c6a90b610fc33874511e5d16 Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Thu, 16 Jan 2025 15:51:19 -0500
Subject: [PATCH] Remove sovereign cloud testing references

---
 .../templates/jobs/archetype-sdk-client.yml          |  2 --
 sdk/containers/azcontainerregistry/ci.yml            |  1 -
 sdk/messaging/azeventhubs/ci.yml                     |  1 -
 sdk/messaging/azservicebus/ci.yml                    | 12 ------------
 sdk/security/keyvault/azkeys/ci.yml                  |  8 --------
 5 files changed, 24 deletions(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index c5d6e7796bc7..a9c9d0cb64c5 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -42,8 +42,6 @@ parameters:
       # Canary regions are currently not supported in TME so disabling for now
       # Canary:
       #   Location: 'centraluseuap'
-      UsGov:
-      China:
   - name: MatrixConfigs
     type: object
     default:
diff --git a/sdk/containers/azcontainerregistry/ci.yml b/sdk/containers/azcontainerregistry/ci.yml
index 5ff81c29d8ce..a684dda945a5 100644
--- a/sdk/containers/azcontainerregistry/ci.yml
+++ b/sdk/containers/azcontainerregistry/ci.yml
@@ -28,5 +28,4 @@ extends:
     RunLiveTests: true
     UsePipelineProxy: false
     TestRunTime: '30m'
-    SupportedClouds: 'Public,UsGov'
     PersistOidcToken: true
diff --git a/sdk/messaging/azeventhubs/ci.yml b/sdk/messaging/azeventhubs/ci.yml
index ab79ba009161..e6207717e902 100644
--- a/sdk/messaging/azeventhubs/ci.yml
+++ b/sdk/messaging/azeventhubs/ci.yml
@@ -27,7 +27,6 @@ extends:
     ServiceDirectory: 'messaging/azeventhubs'
     # (live tests not yet ready to run)
     RunLiveTests: true
-    SupportedClouds: 'Public,UsGov,China'
     EnvVars:
       AZURE_CLIENT_ID: $(AZEVENTHUBS_CLIENT_ID)
       AZURE_TENANT_ID: $(AZEVENTHUBS_TENANT_ID)
diff --git a/sdk/messaging/azservicebus/ci.yml b/sdk/messaging/azservicebus/ci.yml
index f4f00f3623f7..e79c1d7bfa7c 100644
--- a/sdk/messaging/azservicebus/ci.yml
+++ b/sdk/messaging/azservicebus/ci.yml
@@ -26,18 +26,6 @@ extends:
   parameters:
     ServiceDirectory: 'messaging/azservicebus'
     RunLiveTests: true
-    # SupportedClouds: 'Public,UsGov,China'
-    SupportedClouds: 'China'
-    CloudConfig:
-      Public:
-      UsGov:
-      China:
-        MatrixReplace:
-          # Use dedicated pool with regional affinity to China cloud
-          - Pool=(.*)-general/$1-asia
-        MatrixFilters:
-          - Pool=.*mms-ubuntu-2004.*
-          - GoVersion=1.18.10
     EnvVars:
       AZURE_CLIENT_ID: $(AZSERVICEBUS_CLIENT_ID)
       AZURE_TENANT_ID: $(AZSERVICEBUS_TENANT_ID)
diff --git a/sdk/security/keyvault/azkeys/ci.yml b/sdk/security/keyvault/azkeys/ci.yml
index 8edd7e958ed1..9b3a65805c62 100644
--- a/sdk/security/keyvault/azkeys/ci.yml
+++ b/sdk/security/keyvault/azkeys/ci.yml
@@ -28,14 +28,6 @@ extends:
     ServiceDirectory: 'security/keyvault/azkeys'
     RunLiveTests: true
     UsePipelineProxy: false
-    CloudConfig:
-      Public:
-      UsGov:
-        MatrixFilters:
-         - ArmTemplateParameters=^(?!.*enableHsm.*true)
-      China:
-        MatrixFilters:
-         - ArmTemplateParameters=^(?!.*enableHsm.*true)
 
     # Due to the high cost of Managed HSMs, we only want to test using them weekly.
     ${{ if contains(variables['Build.DefinitionName'], 'weekly') }}: