Skip to content

Commit

Permalink
Live tests allow passing of location from top level tests.yml (#12117)
Browse files Browse the repository at this point in the history
* allow tests.yml to provide location to deploy-test-resources.yml

* parameterize SubscriptionConfiguration in archetype-sdk-tests.yml

* don't use SubscriptionConfiguration in matrix entries

* another iteration that allows the SubscriptionConfiguration to be specified in the matrix and a default in template parameters

* Also allow $(Location)
  • Loading branch information
danieljurek authored May 18, 2020
1 parent ffbd034 commit e6a9543
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@ parameters:
MaxParallel: 0
BuildInParallel: true
TimeoutInMinutes: 60
Location: ''
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)

jobs:
- job: "Test"
variables:
- template: ../variables/globals.yml
- name: SubscriptionConfiguration
value: ${{ parameters.SubscriptionConfiguration }}
- name: Location
value: ${{ parameters.Location }}

timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}

Expand All @@ -19,24 +25,19 @@ jobs:
Linux:
OSVmImage: "ubuntu-18.04"
TestTargetFramework: netcoreapp2.1
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Windows_NetCoreApp:
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
Windows_NetCoreApp_ProjectReferences:
OSVmImage: "windows-2019"
TestTargetFramework: netcoreapp2.1
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ConvertToProjectReferenceOption: /p:UseProjectReferenceToAzureClients=true
Windows_NetFramework:
OSVmImage: "windows-2019"
TestTargetFramework: net461
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
MacOs:
OSVmImage: "macOS-10.15"
TestTargetFramework: netcoreapp2.1
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
pool:
vmImage: "$(OSVmImage)"

Expand All @@ -61,6 +62,7 @@ jobs:

- template: /eng/common/TestResources/deploy-test-resources.yml
parameters:
Location: $(Location)
ServiceDirectory: '${{ parameters.ServiceDirectory }}'
SubscriptionConfiguration: $(SubscriptionConfiguration)

Expand Down

0 comments on commit e6a9543

Please sign in to comment.