Skip to content

Commit 967b740

Browse files
benbpbenbp
authored
Add missing TestStepMavenInputs parameter to live test stage template (Azure#18932)
* Add missing TestStepMavenInputs parameter to live test stage template * Fix PostSteps parameter name in spring live test * Use Canary cloud configuration for eventhubs, servicebus live tests * Fix TimeoutInMinutes live test parameter * Fix clouds reference in storage live tests yaml * Use live test stage template for cosmos and tables tests * Add artifacts to appconfiguration live test config
1 parent fa26ffc commit 967b740

File tree

11 files changed

+116
-123
lines changed

11 files changed

+116
-123
lines changed

‎eng/pipelines/templates/jobs/archetype-sdk-tests.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ parameters:
77
PreSteps: []
88
PostSteps: []
99
TimeoutInMinutes: 60
10-
TestStepMavenInputs:
11-
options: '$(DefaultOptions) -Dmaven.javadoc.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false -pl $(ProjectList)'
12-
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
13-
javaHomeOption: 'JDKVersion'
14-
jdkVersionOption: '$(JavaTestVersion)'
15-
jdkArchitectureOption: 'x64'
16-
publishJUnitResults: false
17-
goals: 'verify'
10+
TestStepMavenInputs: {}
1811
TestResultsFiles: ''
1912
CloudConfig: {}
2013
ArmTemplateParameters: '@{}'

‎eng/pipelines/templates/stages/archetype-sdk-tests.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
parameters:
2+
- name: TestName
3+
type: string
4+
default: 'LiveTest'
25
- name: AdditionalPlatforms
36
type: object
47
default: {}
@@ -47,6 +50,16 @@ parameters:
4750
- name: TestSetupSteps
4851
type: stepList
4952
default: []
53+
- name: TestStepMavenInputs
54+
type: object
55+
default:
56+
options: '$(DefaultOptions) -Dmaven.javadoc.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false -pl $(ProjectList)'
57+
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
58+
javaHomeOption: 'JDKVersion'
59+
jdkVersionOption: '$(JavaTestVersion)'
60+
jdkArchitectureOption: 'x64'
61+
publishJUnitResults: false
62+
goals: 'verify'
5063
- name: CloudConfig
5164
type: object
5265
default:
@@ -86,7 +99,7 @@ stages:
8699
# - ${{ if or(contains(parameters.Clouds, cloud.key), contains(variables['Build.DefinitionName'], 'tests-weekly')) }}:
87100
- ${{ if or(contains(parameters.Clouds, cloud.key), and(contains(variables['Build.DefinitionName'], 'tests-weekly'), eq(cloud.key, 'Canary'))) }}:
88101
- ${{ if not(contains(parameters.UnsupportedClouds, cloud.key)) }}:
89-
- stage: ${{ cloud.key }}
102+
- stage: ${{ cloud.key }}_${{ parameters.TestName }}
90103
dependsOn: []
91104
jobs:
92105
- template: /eng/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -105,6 +118,7 @@ stages:
105118
Location: ${{ parameters.Location }}
106119
ServiceDirectory: ${{ parameters.ServiceDirectory }}
107120
TestSetupSteps: ${{ parameters.TestSetupSteps }}
121+
TestStepMavenInputs: ${{ parameters.TestStepMavenInputs }}
108122
Artifacts: ${{ parameters.Artifacts }}
109123
AdditionalModules: ${{ parameters.AdditionalModules }}
110124
TestResultsFiles: ${{ parameters.TestResultsFiles }}

‎sdk/appconfiguration/tests.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ stages:
44
- template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
55
parameters:
66
ServiceDirectory: appconfiguration
7+
Artifacts:
8+
- name: azure-data-appconfiguration
9+
groupId: com.azure
10+
safeName: azuredataappconfiguration
711
EnvVars:
812
AZURE_TEST_MODE: RECORD
913
AZURE_APPCONFIG_CONNECTION_STRING: $(AZURE_APPCONFIG_CONNECTION_STRING)
1014
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
1115
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
12-
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
16+
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)

‎sdk/cosmos/tests.yml‎

Lines changed: 69 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -6,85 +6,73 @@ variables:
66
value: ''
77

88
stages:
9-
- stage: Cosmos_Live_Test
10-
jobs:
11-
- template: /eng/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
12-
parameters:
13-
CloudConfig:
14-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
15-
Cloud: Public
16-
MatrixConfigs:
17-
- Name: Cosmos_live_test
18-
Path: sdk/cosmos/platform-matrix.json
19-
Selection: all
20-
GenerateVMJobs: true
21-
AdditionalParameters:
22-
ServiceDirectory: cosmos
23-
Artifacts:
24-
- name: azure-cosmos
25-
groupId: com.azure
26-
safeName: azurecosmos
27-
AdditionalModules:
28-
- name: azure-cosmos-benchmark
29-
groupId: com.azure
30-
TimeoutInMinutes: 120
31-
MaxParallel: 8
32-
PreSteps:
33-
- template: /eng/pipelines/templates/steps/install-reporting-tools.yml
34-
TestStepMavenInputs:
35-
goals: verify
36-
options: '$(ProfileFlag) -Dgpg.skip $(AdditionalArgs) -pl $(ProjectList)'
37-
TestResultsFiles: '**/junitreports/TEST-*.xml'
9+
- template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
10+
parameters:
11+
MatrixConfigs:
12+
- Name: Cosmos_live_test
13+
Path: sdk/cosmos/platform-matrix.json
14+
Selection: all
15+
GenerateVMJobs: true
16+
ServiceDirectory: cosmos
17+
Artifacts:
18+
- name: azure-cosmos
19+
groupId: com.azure
20+
safeName: azurecosmos
21+
AdditionalModules:
22+
- name: azure-cosmos-benchmark
23+
groupId: com.azure
24+
TimeoutInMinutes: 120
25+
MaxParallel: 8
26+
PreSteps:
27+
- template: /eng/pipelines/templates/steps/install-reporting-tools.yml
28+
TestStepMavenInputs:
29+
goals: verify
30+
options: '$(ProfileFlag) -Dgpg.skip $(AdditionalArgs) -pl $(ProjectList)'
31+
TestResultsFiles: '**/junitreports/TEST-*.xml'
3832

39-
- stage: Cosmos_Live_Test_Integration
40-
dependsOn: []
41-
jobs:
42-
- template: /eng/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
43-
parameters:
44-
CloudConfig:
45-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
46-
Cloud: Public
47-
MatrixConfigs:
48-
- Name: Cosmos_live_test_integration
49-
Path: sdk/cosmos/integration-matrix.json
50-
Selection: all
51-
GenerateVMJobs: true
52-
AdditionalParameters:
53-
ServiceDirectory: cosmos
54-
Artifacts:
55-
- name: azure-spring-data-cosmos-test
56-
groupId: com.azure
57-
safeName: azurespringdatacosmostest
58-
TimeoutInMinutes: 90
59-
EnvVars:
60-
AZURE_TEST_MODE: LIVE
61-
PreSteps:
62-
- template: /eng/pipelines/templates/steps/install-reporting-tools.yml
63-
PostSteps:
64-
- script: |
65-
python --version
66-
python -m pip install setuptools termcolor in_place
67-
python sdk/spring/scripts/replace_util.py --module cosmos --log debug --color false
68-
displayName: 'Run replace_util.py'
69-
- task: Maven@3
70-
displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)'
71-
inputs:
72-
mavenPomFile: pom.xml
73-
goals: 'install'
74-
options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
75-
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
76-
javaHomeOption: 'JDKVersion'
77-
jdkVersionOption: $(JavaBuildVersion)
78-
jdkArchitectureOption: 'x64'
79-
publishJUnitResults: false
80-
- task: Maven@3
81-
displayName: 'Run tests again: $(DisplayName)'
82-
inputs:
83-
mavenPomFile: pom.xml
84-
goals: clean verify
85-
options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)'
86-
env:
87-
AZURE_TEST_MODE: LIVE
88-
TestStepMavenInputs:
89-
goals: clean verify
90-
options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)'
33+
- template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
34+
parameters:
35+
TestName: 'Integration'
36+
MatrixConfigs:
37+
- Name: Cosmos_live_test_integration
38+
Path: sdk/cosmos/integration-matrix.json
39+
Selection: all
40+
GenerateVMJobs: true
41+
ServiceDirectory: cosmos
42+
Artifacts:
43+
- name: azure-spring-data-cosmos-test
44+
groupId: com.azure
45+
safeName: azurespringdatacosmostest
46+
TimeoutInMinutes: 90
47+
EnvVars:
48+
AZURE_TEST_MODE: LIVE
49+
PreSteps:
50+
- template: /eng/pipelines/templates/steps/install-reporting-tools.yml
51+
PostSteps:
52+
- script: |
53+
python --version
54+
python -m pip install setuptools termcolor in_place
55+
python sdk/spring/scripts/replace_util.py --module cosmos --log debug --color false
56+
displayName: 'Run replace_util.py'
57+
- task: Maven@3
58+
displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)'
59+
inputs:
60+
mavenPomFile: pom.xml
61+
goals: 'install'
62+
options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
63+
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
64+
javaHomeOption: 'JDKVersion'
65+
jdkVersionOption: $(JavaBuildVersion)
66+
jdkArchitectureOption: 'x64'
67+
publishJUnitResults: false
68+
- task: Maven@3
69+
displayName: 'Run tests again: $(DisplayName)'
70+
inputs:
71+
mavenPomFile: pom.xml
72+
goals: clean verify
73+
options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)'
74+
env:
75+
AZURE_TEST_MODE: LIVE
76+
TestStepMavenInputs:
77+
goals: clean verify
78+
options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)'

‎sdk/eventgrid/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ stages:
44
- template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
55
parameters:
66
ServiceDirectory: eventgrid
7-
Timeout: 60
7+
TimeoutInMinutes: 60
88
MaxParallel: 7
99
EnvVars:
1010
AZURE_TEST_MODE: RECORD

‎sdk/eventhubs/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ stages:
1212
groupId: com.azure
1313
safeName: azuremessagingeventhubscheckpointstoreblob
1414
TimeoutInMinutes: 120
15-
TestCanary: true
15+
Clouds: 'Public,Canary'
1616
EnvVars:
1717
AZURE_TEST_MODE: RECORD
1818
AZURE_LOG_LEVEL: 2

‎sdk/search/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ stages:
44
- template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
55
parameters:
66
ServiceDirectory: search
7-
Timeout: 60
7+
TimeoutInMinutes: 60
88
MaxParallel: 7
99
EnvVars:
1010
AZURE_TEST_MODE: LIVE

‎sdk/servicebus/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88
- name: azure-messaging-servicebus
99
groupId: com.azure
1010
safeName: azuremessagingservicebus
11-
TestCanary: true
11+
Clouds: 'Public,Canary'
1212
EnvVars:
1313
AZURE_TEST_MODE: RECORD
1414
AZURE_LOG_LEVEL: 2

‎sdk/spring/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ stages:
7676
AAD_B2C_CLIENT_ID: $(java-spring-aad-b2c-client-id)
7777
AAD_B2C_CLIENT_SECRET: $(java-spring-aad-b2c-client-secret)
7878

79-
PostRunSteps:
79+
PostSteps:
8080
- script: |
8181
python --version
8282
python -m pip install setuptools termcolor in_place

‎sdk/storage/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ stages:
3737
safeName: azurestoragequeue
3838
TimeoutInMinutes: 240
3939
Location: canadacentral
40-
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
40+
Clouds: 'Preview'
4141
EnvVars:
4242
AZURE_TEST_MODE: LIVE
4343
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)

0 commit comments

Comments
 (0)