From be61cfb3457247332abd719eda568b980adacd5d Mon Sep 17 00:00:00 2001 From: Muyao Date: Tue, 12 Sep 2023 16:19:54 +0800 Subject: [PATCH] Organize the Spring directory --- sdk/spring/compatibility-tests.yml | 4 ++-- sdk/spring/{ => pipeline}/compatibility-tests-job.yml | 0 sdk/spring/{ => pipeline}/cosmos-integration-matrix.json | 0 sdk/spring/{ => pipeline}/supported-version-matrix.json | 0 .../scripts/compatibility_get_spring_cloud_version.py | 2 +- .../compatibility_update_supported_version_matrix_json.py | 8 ++++---- sdk/spring/tests.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename sdk/spring/{ => pipeline}/compatibility-tests-job.yml (100%) rename sdk/spring/{ => pipeline}/cosmos-integration-matrix.json (100%) rename sdk/spring/{ => pipeline}/supported-version-matrix.json (100%) diff --git a/sdk/spring/compatibility-tests.yml b/sdk/spring/compatibility-tests.yml index 94a97bf54d407..245bdb313b72c 100644 --- a/sdk/spring/compatibility-tests.yml +++ b/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 diff --git a/sdk/spring/compatibility-tests-job.yml b/sdk/spring/pipeline/compatibility-tests-job.yml similarity index 100% rename from sdk/spring/compatibility-tests-job.yml rename to sdk/spring/pipeline/compatibility-tests-job.yml diff --git a/sdk/spring/cosmos-integration-matrix.json b/sdk/spring/pipeline/cosmos-integration-matrix.json similarity index 100% rename from sdk/spring/cosmos-integration-matrix.json rename to sdk/spring/pipeline/cosmos-integration-matrix.json diff --git a/sdk/spring/supported-version-matrix.json b/sdk/spring/pipeline/supported-version-matrix.json similarity index 100% rename from sdk/spring/supported-version-matrix.json rename to sdk/spring/pipeline/supported-version-matrix.json diff --git a/sdk/spring/scripts/compatibility_get_spring_cloud_version.py b/sdk/spring/scripts/compatibility_get_spring_cloud_version.py index 1e30bf7c94f34..ae9851f77ad61 100644 --- a/sdk/spring/scripts/compatibility_get_spring_cloud_version.py +++ b/sdk/spring/scripts/compatibility_get_spring_cloud_version.py @@ -40,7 +40,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__': diff --git a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py b/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py index 4e9476321701d..9b71ded4b2f68 100644 --- a/sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py +++ b/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)) diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index 3ebb231d220be..5df2b1ee7f886 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -70,7 +70,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: