Skip to content

Commit ac0a5d9

Browse files
authored
Fix spring compatibility tests (#46729)
* remove unsupported versions * add condition
1 parent 67b98fa commit ac0a5d9

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

sdk/spring/pipeline/compatibility-tests-job.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
- 'sdk/trafficmanager/azure-resourcemanager-trafficmanager'
6666
- task: Maven@4
6767
displayName: 'Install Unreleased Dependencies'
68+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
6869
inputs:
6970
mavenPomFile: sdk/spring/pipeline/ClientFromSourcePom.xml
7071
goals: 'install'
@@ -77,23 +78,29 @@ jobs:
7778
- script: |
7879
python -m pip install termcolor
7980
displayName: 'Install python module'
81+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
8082
- bash: |
8183
echo "##vso[task.setVariable variable=SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION]$(python ./sdk/spring/scripts/compatibility_get_spring_cloud_version.py -b $(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION))"
8284
displayName: 'Set supported Spring version to environment variables'
85+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
8386
- bash: |
8487
echo "$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION):"
8588
echo "https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION)/spring-boot-dependencies-$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION).pom"
8689
echo "$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION):"
8790
echo "https://repo1.maven.org/maven2/org/springframework/cloud/spring-cloud-dependencies/$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION)/spring-cloud-dependencies-$(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION).pom"
8891
displayName: 'Log Spring version and Maven pom path'
92+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
8993
- script: |
9094
python ./sdk/spring/scripts/compatibility_insert_dependencymanagement.py -b $(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION) -c $(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_CLOUD_VERSION)
9195
displayName: 'Insert Spring dependency managements'
96+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
9297
- script: |
9398
python ./sdk/spring/scripts/compatibility_delete_version.py -b $(SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION)
9499
displayName: 'Remove unused dependency versions'
100+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
95101
- task: Maven@4
96102
displayName: 'Run tests'
103+
condition: ne(variables['SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION'], '')
97104
inputs:
98105
options: '$(DefaultOptions) -ntp -T ${{parameters.BuildParallelization}} ${{parameters.SkipOptions}} -Dcompiler.failondeprecatedstatus=- --fail-at-end'
99106
mavenPomFile: sdk/spring/pom.xml

sdk/spring/pipeline/spring-cloud-azure-supported-spring.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"current" : false,
2828
"releaseStatus" : "GENERAL_AVAILABILITY",
2929
"snapshot" : false,
30-
"supportStatus" : "SUPPORTED",
30+
"supportStatus" : "END_OF_LIFE",
3131
"spring-boot-version" : "3.4.9",
3232
"spring-cloud-version" : "2024.0.2"
3333
},
@@ -83,7 +83,7 @@
8383
"current" : false,
8484
"releaseStatus" : "GENERAL_AVAILABILITY",
8585
"snapshot" : false,
86-
"supportStatus" : "SUPPORTED",
86+
"supportStatus" : "END_OF_LIFE",
8787
"spring-boot-version" : "3.3.13",
8888
"spring-cloud-version" : "2023.0.5"
8989
},
@@ -195,7 +195,7 @@
195195
"current" : false,
196196
"releaseStatus" : "GENERAL_AVAILABILITY",
197197
"snapshot" : false,
198-
"supportStatus" : "SUPPORTED",
198+
"supportStatus" : "END_OF_LIFE",
199199
"spring-boot-version" : "3.2.12",
200200
"spring-cloud-version" : "2023.0.3"
201201
},
@@ -371,7 +371,7 @@
371371
"current" : false,
372372
"releaseStatus" : "GENERAL_AVAILABILITY",
373373
"snapshot" : false,
374-
"supportStatus" : "SUPPORTED",
374+
"supportStatus" : "END_OF_LIFE",
375375
"spring-boot-version" : "3.1.12",
376376
"spring-cloud-version" : "2022.0.5"
377377
},
@@ -563,7 +563,7 @@
563563
"current" : false,
564564
"releaseStatus" : "GENERAL_AVAILABILITY",
565565
"snapshot" : false,
566-
"supportStatus" : "SUPPORTED",
566+
"supportStatus" : "END_OF_LIFE",
567567
"spring-boot-version" : "3.0.13",
568568
"spring-cloud-version" : "2022.0.5"
569569
},

0 commit comments

Comments
 (0)