From a91073f3d9685ada1e7688e172c9998ff5925f0f Mon Sep 17 00:00:00 2001
From: Muyao <v-muyaofeng@microsoft.com>
Date: Tue, 6 Jun 2023 14:30:56 +0800
Subject: [PATCH 1/2] move appconfig IT

---
 sdk/spring/tests.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml
index e407866ea353..f20a179fd609 100644
--- a/sdk/spring/tests.yml
+++ b/sdk/spring/tests.yml
@@ -14,7 +14,6 @@ stages:
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           Location: "chinanorth3"
       TestResourceDirectories:
-        - spring/spring-cloud-azure-integration-test-appconfiguration-config
         - spring/spring-cloud-azure-integration-tests/test-resources/common
         - spring/spring-cloud-azure-integration-tests/test-resources/jdbc/mysql
         - spring/spring-cloud-azure-integration-tests/test-resources/appconfiguration
@@ -28,14 +27,32 @@ stages:
         - name: spring-cloud-azure-integration-tests
           groupId: com.azure.spring
           safeName: springcloudazureintegrationtests
-        - name: spring-cloud-azure-integration-test-appconfiguration-config
-          groupId: com.azure.spring
-          safeName: springcloudazureintegrationtestappconfigurationconfig
       TimeoutInMinutes: 240
       ServiceDirectory: spring
       TestName: Spring_IT
       TestGoals: "verify"
       TestOptions: "-DskipSpringITs=false"
+  - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
+    parameters:
+      SupportedClouds: 'Public,UsGov,China'
+      Clouds: 'Public'
+      CloudConfig:
+        Public:
+          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        UsGov:
+          SubscriptionConfiguration: $(sub-config-gov-test-resources)
+        China:
+          SubscriptionConfiguration: $(sub-config-cn-test-resources)
+      TestResourceDirectories:
+        - spring/spring-cloud-azure-integration-test-appconfiguration-config
+      Artifacts:
+        - name: spring-cloud-azure-integration-test-appconfiguration-config
+          groupId: com.azure.spring
+          safeName: springcloudazureintegrationtestappconfigurationconfig
+      TimeoutInMinutes: 60
+      ServiceDirectory: spring
+      TestName: Appconfiguration_Config_IT
+      TestGoals: 'verify'
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       SupportedClouds: 'Public,UsGov,China'

From a98cf5cff1532b0d036edd0c27b9e7813d9f0bbf Mon Sep 17 00:00:00 2001
From: Muyao Feng <92105726+Netyyyy@users.noreply.github.com>
Date: Wed, 7 Jun 2023 08:13:12 +0800
Subject: [PATCH 2/2] Update tests.yml

---
 sdk/spring/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml
index f20a179fd609..3a116d3d82d1 100644
--- a/sdk/spring/tests.yml
+++ b/sdk/spring/tests.yml
@@ -51,7 +51,7 @@ stages:
           safeName: springcloudazureintegrationtestappconfigurationconfig
       TimeoutInMinutes: 60
       ServiceDirectory: spring
-      TestName: Appconfiguration_Config_IT
+      TestName: Spring_App_Config_IT
       TestGoals: 'verify'
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters: