Enable all Azure clouds on end-to-end tests

Azure · May 16, 2023 · 0484342 · 0484342
1 parent 328421b
commit 0484342
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/tests_e2e/orchestrator/runbook.yml b/tests_e2e/orchestrator/runbook.yml
@@ -116,12 +116,9 @@ platform:
     keep_environment: $(keep_environment)
     azure:
       deploy: True
-#
-# TODO: Enable these parameters once LISA supports all Azure clouds
-#
-#      cloud: $(cloud)
-#      marketplace_image_information_location: $(c_marketplace_image_information_location)
-#      shared_resource_group_location: $(c_shared_resource_group_location)
+      cloud: $(cloud)
+      marketplace_image_information_location: $(c_marketplace_image_information_location)
+      shared_resource_group_location: $(c_shared_resource_group_location)
       subscription_id: $(subscription_id)
       wait_delete: false
       vm_tags: $(c_vm_tags)

diff --git a/tests_e2e/orchestrator/sample_runbooks/existing_vm.yml b/tests_e2e/orchestrator/sample_runbooks/existing_vm.yml
@@ -116,12 +116,9 @@ platform:
     admin_username: $(user)
     admin_private_key_file: $(identity_file)
     azure:
-#
-# TODO: Enable these parameters once LISA supports all Azure clouds
-#
-#      cloud: $(cloud)
-#      marketplace_image_information_location: $(c_marketplace_image_information_location)
-#      shared_resource_group_location: $(c_shared_resource_group_location)
+      cloud: $(cloud)
+      marketplace_image_information_location: $(c_marketplace_image_information_location)
+      shared_resource_group_location: $(c_shared_resource_group_location)
       resource_group_name: $(resource_group_name)
       deploy: false
       subscription_id: $(subscription_id)

diff --git a/tests_e2e/pipeline/pipeline-cleanup.yml b/tests_e2e/pipeline/pipeline-cleanup.yml
@@ -19,11 +19,8 @@ parameters:
     type: object
     default:
       - azuremanagement
-#
-# TODO: Enable these services connections once we create test pipelines for all Azure clouds
-#
-#      - azuremanagement.china
-#      - azuremanagement.government
+      - azuremanagement.china
+      - azuremanagement.government
 
 pool:
   vmImage: ubuntu-latest