Skip to content

Commit c13cfc0

Browse files
Netyyyysaragluna
andauthored
Update Spring Boot compatibility test to support 2.6.8/2.7.0/2.5.14 (#28982)
* remove compatibility tests in ci Co-authored-by: Xiaolu Dai <[email protected]>
1 parent 2b9b3de commit c13cfc0

13 files changed

+338
-424
lines changed

sdk/spring/ci.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,3 @@ extends:
246246
parameters:
247247
ServiceDirectory: spring
248248
Artifacts: ${{ parameters.Artifacts }}
249-
AdditionalStagesAfterBuild:
250-
- stage: TestLatestVersion
251-
jobs:
252-
- template: ../../../../sdk/spring/spring-sdk-client-test.yml
253-
parameters:
254-
Artifacts: ${{ parameters.Artifacts }}
255-
SpringBootVersion: 2.6.7
256-
SpringCloudVersion: 2021.0.2
257-
- stage: TestCompatibleVersion
258-
jobs:
259-
- template: ../../../../sdk/spring/spring-sdk-client-test.yml
260-
parameters:
261-
Artifacts: ${{ parameters.Artifacts }}
262-
SpringBootVersion: 2.5.13
263-
SpringCloudVersion: 2020.0.5

sdk/spring/compatibility-test.yml

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,18 @@ variables:
55
- template: ../../eng/pipelines/templates/variables/globals.yml
66

77
stages:
8-
- stage:
8+
- stage: "spring_boot_compatibility_tests"
99
jobs:
10-
- job:
11-
12-
pool:
13-
vmImage: "ubuntu-latest"
14-
15-
steps:
16-
- script: |
17-
pip install termcolor
18-
displayName: 'python module install'
19-
- script: |
20-
python ./sdk/spring/scripts/compatibility_add_dependencymanagement.py -b 2.6.6 -c 2021.0.1
21-
displayName: 'add dependency management'
22-
- script: |
23-
python ./sdk/spring/scripts/compatibility_deleted_version.py
24-
displayName: 'delete version control'
25-
- task: Maven@3
26-
displayName: 'Run tests'
27-
inputs:
28-
mavenPomFile: sdk/spring/pom.xml
29-
mavenOptions: '$(MemoryOptions)'
30-
javaHomeOption: 'JDKVersion'
31-
jdkVersionOption: $(JavaTestVersion)
32-
jdkArchitectureOption: 'x64'
33-
goals: 'clean test -Pdev'
10+
- template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
11+
parameters:
12+
SparseCheckout: true
13+
JobTemplatePath: ../../../../../sdk/spring/compatibility-tests-job.yml
14+
AdditionalParameters:
15+
ServiceDirectory: spring
16+
MatrixConfigs:
17+
- Name: spring_boot_supported_version_tests
18+
Path: sdk/spring/supported-version-matrix.json
19+
Selection: sparse
20+
NonSparseParameters:
21+
- SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION
22+
GenerateVMJobs: true
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
parameters:
2+
Matrix: ''
3+
MaxParallel: 10
4+
SkipOptions: "-Dcheckstyle.skip=true -Dcodesnippet.skip -Denforcer.skip -Djacoco.skip=true
5+
-Dmaven.javadoc.skip=true -Drevapi.skip=true -Dspotbugs.skip=true"
6+
BuildParallelization: '2C'
7+
8+
jobs:
9+
- job: 'compatibility_test'
10+
dependsOn: ${{ parameters.DependsOn }}
11+
condition: and(succeededOrFailed(), ne(${{ parameters.Matrix }}, '{}'))
12+
strategy:
13+
maxParallel: ${{ parameters.MaxParallel }}
14+
matrix: $[ ${{ parameters.Matrix }} ]
15+
variables:
16+
- template: ../../eng/pipelines/templates/variables/globals.yml
17+
steps:
18+
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
19+
parameters:
20+
Paths:
21+
- 'sdk/spring'
22+
- 'sdk/boms/spring-cloud-azure-dependencies'
23+
- script: |
24+
pip install termcolor
25+
displayName: 'python module install'
26+
- script: |
27+
python ./sdk/spring/scripts/compatibility_insert_dependencymanagement.py
28+
displayName: 'insert dependency management'
29+
- script: |
30+
python ./sdk/spring/scripts/compatibility_delete_version.py
31+
displayName: 'remove unused version'
32+
- task: Maven@3
33+
displayName: 'Run tests'
34+
inputs:
35+
options: '$(DefaultOptions) -ntp -T ${{parameters.BuildParallelization}}
36+
${{parameters.SkipOptions}}'
37+
mavenPomFile: sdk/spring/pom.xml
38+
mavenOptions: '$(MemoryOptions)'
39+
javaHomeOption: 'JDKVersion'
40+
jdkVersionOption: $(JavaTestVersion)
41+
jdkArchitectureOption: 'x64'
42+
goals: 'clean test -Pdev '

sdk/spring/scripts/ci_insert_dependency_management_in_pom_files.py

Lines changed: 0 additions & 136 deletions
This file was deleted.

sdk/spring/scripts/ci_read_dependency_tree.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

sdk/spring/scripts/ci_update_versions.py

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)