Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organize the Spring directory #36707

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Organize the Spring directory #36707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/spring/compatibility-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 sdk/spring/compatibility-tests-job.yml → ...ring/pipeline/compatibility-tests-job.yml
View file
Open in desktop
File renamed without changes.
0 sdk/spring/cosmos-integration-matrix.json → ...g/pipeline/cosmos-integration-matrix.json
View file
Open in desktop
File renamed without changes.
0 sdk/spring/supported-version-matrix.json → ...ng/pipeline/supported-version-matrix.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sdk/spring/scripts/compatibility_get_spring_cloud_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
8 changes: 4 additions & 4 deletions sdk/spring/scripts/compatibility_update_supported_version_matrix_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down