Organize the Spring directory (#36692)

* Organize the Spring directory

sdk/spring/compatibility-tests.yml

@@ -10,12 +10,12 @@ stages:
       - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
         parameters:
           SparseCheckout: true
-          JobTemplatePath: ../../../../../sdk/spring/compatibility-tests-job.yml
+          JobTemplatePath: ../../../../../sdk/spring/pipeline/compatibility-tests-job.yml
           AdditionalParameters:
             ServiceDirectory: spring
           MatrixConfigs:
             - Name: spring_boot_supported_version_tests
-              Path: sdk/spring/supported-version-matrix.json
+              Path: sdk/spring/pipeline/supported-version-matrix.json
               Selection: sparse
               NonSparseParameters:
                 - SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION

sdk/spring/monitor-tests.yml

@@ -10,12 +10,12 @@ stages:
       - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
         parameters:
           SparseCheckout: true
-          JobTemplatePath: ../../../../../sdk/spring/monitor-tests-job.yml
+          JobTemplatePath: ../../../../../sdk/spring/pipeline/monitor-tests-job.yml
           AdditionalParameters:
             ServiceDirectory: spring
           MatrixConfigs:
             - Name: monitor_compatibility_tests
-              Path: sdk/spring/monitor-supported-version-matrix.json
+              Path: sdk/spring/pipeline/monitor-supported-version-matrix.json
               Selection: sparse
               NonSparseParameters:
                 - TEST_SPRING_BOOT_VERSION

sdk/spring/monitor-tests-job.yml → sdk/spring/pipeline/monitor-tests-job.yml

@@ -12,7 +12,7 @@ jobs:
       maxParallel: ${{ parameters.MaxParallel }}
       matrix: $[ ${{ parameters.Matrix }} ]
     variables:
-      - template: ../../eng/pipelines/templates/variables/globals.yml
+      - template: ../../../eng/pipelines/templates/variables/globals.yml
     steps:
       - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
         parameters:

sdk/spring/scripts/compatibility_get_spring_cloud_version.py

@@ -35,7 +35,7 @@ def get_spring_cloud_version(filepath):
 
 def main():
     change_to_repo_root_dir()
-    get_spring_cloud_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/spring-cloud-azure-supported-spring.json")
+    get_spring_cloud_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json")
 
 
 if __name__ == '__main__':

sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py

@@ -1,11 +1,11 @@
 # Python version 3.4 or higher is required to run this script.
 #
-# This script is used to update sdk\spring\supported-version-matrix.json before compatibility check.
+# This script is used to update sdk\spring\pipeline\supported-version-matrix.json before compatibility check.
 # Sample:
 # 1. python .\sdk\spring\scripts\compatibility_update_supported_version_matrix_json.py
 # 2. python .\sdk\spring\scripts\compatibility_update_supported_version_matrix_json.py -m 3
 #
-# The script must be run at the root of azure-sdk-for-java.import time
+# The script must be run at the root of azure-sdk-for-java.
 
 
 import time
@@ -54,8 +54,8 @@ def main():
     start_time = time.time()
     change_to_repo_root_dir()
     log.debug('Current working directory = {}.'.format(os.getcwd()))
-    suppoerted_spring_boot_version = get_supported_spring_boot_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/spring-cloud-azure-supported-spring.json")
-    update_supported_version_matrix_json_file("./sdk/spring/supported-version-matrix.json", suppoerted_spring_boot_version)
+    suppoerted_spring_boot_version = get_supported_spring_boot_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json")
+    update_supported_version_matrix_json_file("./sdk/spring/pipeline/supported-version-matrix.json", suppoerted_spring_boot_version)
     elapsed_time = time.time() - start_time
     log.info('elapsed_time = {}'.format(elapsed_time))
 

sdk/spring/scripts/monitor_update_monitor_matrix_json.py

@@ -1,6 +1,6 @@
 # Python version 3.4 or higher is required to run this script.
 #
-# This script is used to update sdk\spring\supported-version-matrix.json before compatibility check.
+# This script is used to update sdk\spring\pipeline\supported-version-matrix.json before compatibility check.
 # Sample:
 # 1. python .\sdk\spring\scripts\monitor_update_monitor_matrix_json.py
 #
@@ -49,8 +49,8 @@ def main():
     start_time = time.time()
     change_to_repo_root_dir()
     log.debug('Current working directory = {}.'.format(os.getcwd()))
-    test_spring_boot_version = get_supported_spring_boot_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/spring-cloud-azure-supported-spring.json")
-    update_monitor_matrix_json_file("./sdk/spring/monitor-supported-version-matrix.json", test_spring_boot_version)
+    test_spring_boot_version = get_supported_spring_boot_version("https://raw.githubusercontent.com/Azure/azure-sdk-for-java/main/sdk/spring/pipeline/spring-cloud-azure-supported-spring.json")
+    update_monitor_matrix_json_file("./sdk/spring/pipeline/monitor-supported-version-matrix.json", test_spring_boot_version)
     elapsed_time = time.time() - start_time
     log.info('elapsed_time = {}'.format(elapsed_time))
 

sdk/spring/tests.yml

@@ -66,7 +66,7 @@ stages:
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
       MatrixConfigs:
         - Name: Cosmos_live_test_integration
-          Path: sdk/spring/cosmos-integration-matrix.json
+          Path: sdk/spring/pipeline/cosmos-integration-matrix.json
           Selection: all
           GenerateVMJobs: true
       TestResourceDirectories: