Skip to content

Add TestResourceDirectories parameter to store Arm template paths #18851

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

Merged
yiliuTo merged 8 commits into from
Feb 5, 2021
Merged

Add TestResourceDirectories parameter to store Arm template paths #18851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65abd17
add TestResourceDirectories parameter to store multiple file paths
yiliuTo Jan 28, 2021
dc3e13b
add TestResourceDirectories for spring IT tests
yiliuTo Jan 28, 2021
1b54ea6
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
yiliuTo Feb 2, 2021
efa9faa
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
yiliuTo Feb 3, 2021
0b7fcb0
update remove test resources step with TestResourceDirectories parameter
yiliuTo Feb 3, 2021
d7a7825
add TestResourceDirectories parameter in stages/archetype-sdk-tests.yml
yiliuTo Feb 3, 2021
ecd1a91
test when TestResourceDirectory has one component
yiliuTo Feb 4, 2021
8ba20c3
restore TestResourceDirectory with full Spring test-resouces.json dir…
yiliuTo Feb 4, 2021
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
40 changes: 29 additions & 11 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
parameters:
ServiceDirectory: ''
TestResourceDirectories:
Artifacts: []
AdditionalModules: []
EnvVars: {}
Expand Down Expand Up @@ -44,13 +45,23 @@ jobs:
# - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml

- ${{ if ne(parameters.DisableAzureResourceCreation, 'true') }}:
- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
ArmTemplateParameters: $(ArmTemplateParameters)
- ${{ if parameters.TestResourceDirectories }}:
- ${{ each directory in parameters.TestResourceDirectories }}:
- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ directory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
ArmTemplateParameters: $(ArmTemplateParameters)
- ${{ if not(parameters.TestResourceDirectories) }}:
- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
${{ if or(parameters.Location, parameters.CloudConfig.Location) }}:
Location: ${{ coalesce(parameters.Location, parameters.CloudConfig.Location) }}
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
ArmTemplateParameters: $(ArmTemplateParameters)

- ${{ parameters.PreSteps }}

Expand Down Expand Up @@ -101,10 +112,17 @@ jobs:
- ${{ parameters.PostSteps }}

- ${{ if ne(parameters.DisableAzureResourceCreation, 'true') }}:
- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
- ${{ if parameters.TestResourceDirectories }}:
- ${{ each directory in parameters.TestResourceDirectories }}:
- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '${{ directory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}
- ${{ if not(parameters.TestResourceDirectories) }}:
- template: /eng/common/TestResources/remove-test-resources.yml
parameters:
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: ${{ parameters.CloudConfig.SubscriptionConfiguration }}

- template: ../steps/upload-repository-on-failure.yml

Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ parameters:
- name: ServiceDirectory
type: string
default: not-specified
- name: TestResourceDirectories
type: object
default:
- name: TestSetupSteps
type: stepList
default: []
Expand Down Expand Up @@ -117,6 +120,7 @@ stages:
TimeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
Location: ${{ parameters.Location }}
ServiceDirectory: ${{ parameters.ServiceDirectory }}
TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
TestSetupSteps: ${{ parameters.TestSetupSteps }}
TestStepMavenInputs: ${{ parameters.TestStepMavenInputs }}
Artifacts: ${{ parameters.Artifacts }}
Expand Down
6 changes: 6 additions & 0 deletions sdk/spring/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ stages:
parameters:
TimeoutInMinutes: 240
ServiceDirectory: spring
TestResourceDirectories:
- spring/azure-spring-boot-test-cosmos
- spring/azure-spring-boot-test-servicebus-jms
- spring/azure-spring-cloud-test-eventhubs
- spring/azure-spring-boot-test-keyvault
- spring/azure-spring-boot-test-storage
TestStepMavenInputs:
options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)'
goals: "verify"
Expand Down