Remove ppe from acs and add to phone numbers (#37385)

* Remove ppe from acs and add to phone numbers * Modify tests.yml * Modify tests.yml * Remove ppe from acs * Remove extra template in yml * Fix test yml * Revert changes in test yml * Add ppe to phone numbers
Azure · Oct 25, 2023 · 7b1ce10 · 7b1ce10
1 parent f19539a
commit 7b1ce10
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 19 deletions.
diff --git a/sdk/communication/azure-communication-phonenumbers/tests.yml b/sdk/communication/azure-communication-phonenumbers/tests.yml
@@ -1,12 +1,41 @@
 trigger: none
 
+parameters:
+  - name: runOnlyPPE
+    displayName: "Run only the PPE stage"
+    type: boolean
+    default: false
+
 stages:
-  - template: /sdk/communication/communication-tests-template.yml
-    parameters:
-      PackageName: azure-communication-phonenumbers
-      SafeName: azurecommunicationphonenumbers
-      MatrixConfigs:
-        - Name: PhoneNumbers_java_livetest_matrix
-          Path: sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json
-          Selection: sparse
-          GenerateVMJobs: true
+    - template: /sdk/communication/communication-tests-template.yml
+      parameters:
+          PackageName: azure-communication-phonenumbers
+          SafeName: azurecommunicationphonenumbers
+          ${{ if eq(parameters.runOnlyPPE, true) }}:
+            Clouds: 'PPE'
+          ${{ if eq(parameters.runOnlyPPE, false) }}:
+            Clouds: 'Public,PPE,Int'
+          CloudConfig:
+            Public:
+              SubscriptionConfigurations:
+                - $(sub-config-azure-cloud-test-resources)
+                - $(sub-config-communication-services-cloud-test-resources-common)
+                - $(sub-config-communication-services-cloud-test-resources-java)
+            Int:
+              SubscriptionConfigurations:
+                - $(sub-config-communication-int-test-resources-common)
+                - $(sub-config-communication-int-test-resources-java)
+
+              MatrixReplace:
+                - SKIP_UPDATE_CAPABILITIES_LIVE_TESTS=false/true
+            PPE:
+              SubscriptionConfigurations:
+                - $(sub-config-communication-ppe-test-resources-common)
+                - $(sub-config-communication-ppe-test-resources-java)
+              MatrixReplace:
+                - SKIP_UPDATE_CAPABILITIES_LIVE_TESTS=false/true  
+          MatrixConfigs:
+          - Name: PhoneNumbers_java_livetest_matrix
+            Path: sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json
+            Selection: sparse
+            GenerateVMJobs: true
diff --git a/sdk/communication/communication-tests-template.yml b/sdk/communication/communication-tests-template.yml
@@ -7,7 +7,7 @@ parameters:
   default: not-specified
 - name: Clouds
   type: string
-  default: 'Public, PPE, Int'
+  default: 'Public, Int'
 - name: TestMode
   type: string
   default: 'LIVE'
@@ -33,15 +33,6 @@ parameters:
         - $(sub-config-azure-cloud-test-resources)
         - $(sub-config-communication-services-cloud-test-resources-common)
         - $(sub-config-communication-services-cloud-test-resources-java)
-    PPE:
-      SubscriptionConfigurations:
-        - $(sub-config-communication-ppe-test-resources-common)
-        - $(sub-config-communication-ppe-test-resources-java)
-
-      # This only affects the phone-numbers package
-      MatrixReplace:
-        - SKIP_UPDATE_CAPABILITIES_LIVE_TESTS=false/true
-        - SKIP_SIP_ROUTING_LIVE_TESTS=false/true
     Int:
       SubscriptionConfigurations:
         - $(sub-config-communication-int-test-resources-common)