From 0b44f387f0d18da33fecb2519d185fdddbefef1d Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 15 May 2020 20:37:54 -0700 Subject: [PATCH] Smoke Tests use new subscription configuration template (#11202) * smoke tests use subscription configuration * use SubscriptionConfiguration in archetype-sdk-tests.yml --- common/smoke-tests/smoke-test.yml | 25 ++++++++++--------- .../templates/jobs/archetype-sdk-tests.yml | 14 ++++++----- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/common/smoke-tests/smoke-test.yml b/common/smoke-tests/smoke-test.yml index 671e334ee2836..2a9edc08e0a02 100644 --- a/common/smoke-tests/smoke-test.yml +++ b/common/smoke-tests/smoke-test.yml @@ -13,61 +13,61 @@ jobs: ProfileFlag: '' JavaVersion: '1.8' OSVmImage: windows-2019 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java LTS Windows (AzureCloud): ProfileFlag: '-Pjava-lts' JavaVersion: '1.11' OSVmImage: windows-2019 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java 8 Linux (AzureCloud): ProfileFlag: '' JavaVersion: '1.8' OSVmImage: ubuntu-18.04 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java LTS Linux (AzureCloud): ProfileFlag: '-Pjava-lts' JavaVersion: '1.11' OSVmImage: ubuntu-18.04 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java 8 MacOS (AzureCloud): ProfileFlag: '' JavaVersion: '1.8' OSVmImage: macOS-10.15 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java LTS MacOS (AzureCloud): ProfileFlag: '-Pjava-lts' JavaVersion: '1.11' OSVmImage: macOS-10.15 - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Java 8 Windows (AzureUSGovernment): ProfileFlag: '' JavaVersion: '1.8' OSVmImage: windows-2019 - CloudType: AzureUSGovernment + SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) Java LTS Windows (AzureUSGovernment): ProfileFlag: '-Pjava-lts' JavaVersion: '1.11' OSVmImage: windows-2019 - CloudType: AzureUSGovernment + SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) Java 8 Windows (AzureChinaCloud): ProfileFlag: '' JavaVersion: '1.8' OSVmImage: windows-2019 - CloudType: AzureChinaCloud + SubscriptionConfiguration: $(sub-config-cn-test-resources) ArmTemplateParameters: $(azureChinaCloudArmParameters) Java LTS Windows (AzureChinaCloud): ProfileFlag: '-Pjava-lts' JavaVersion: '1.11' OSVmImage: windows-2019 - CloudType: AzureChinaCloud + SubscriptionConfiguration: $(sub-config-cn-test-resources) ArmTemplateParameters: $(azureChinaCloudArmParameters) pool: @@ -133,8 +133,8 @@ jobs: - template: /eng/common/TestResources/deploy-test-resources.yml parameters: ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' - CloudType: $(CloudType) ArmTemplateParameters: $(ArmTemplateParameters) + SubscriptionConfiguration: $(SubscriptionConfiguration) - task: Maven@3 displayName: 'Run Smoke Tests' @@ -151,4 +151,5 @@ jobs: - template: /eng/common/TestResources/remove-test-resources.yml parameters: - ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' \ No newline at end of file + ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/' + SubscriptionConfiguration: $(SubscriptionConfiguration) \ No newline at end of file diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index a25a07a11d178..e12e4720d58a7 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -9,37 +9,37 @@ parameters: OSVmImage: 'ubuntu-18.04' JavaVersion: '1.8' DisplayName: 'Linux - Java 8' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: netty macOS - Java 8 (AzureCloud): OSVmImage: 'macOS-10.15' JavaVersion: '1.8' DisplayName: 'macOS - Java 8' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: okhttp Windows - Java 8 (AzureCloud): OSVmImage: 'windows-2019' JavaVersion: '1.8' DisplayName: 'Windows - Java 8' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: netty Linux - Java 11 (AzureCloud): OSVmImage: 'ubuntu-18.04' JavaVersion: '1.11' DisplayName: 'Linux - Java 11' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: okhttp macOS - Java 11 (AzureCloud): OSVmImage: 'macOS-10.15' JavaVersion: '1.11' DisplayName: 'macOS - Java 11' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: netty Windows - Java 11 (AzureCloud): OSVmImage: 'windows-2019' JavaVersion: '1.11' DisplayName: 'Windows - Java 11' - CloudType: AzureCloud + SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) AZURE_TEST_HTTP_CLIENTS: okhttp PreRunSteps: [] PostRunSteps: [] @@ -79,6 +79,7 @@ jobs: - template: /eng/common/TestResources/deploy-test-resources.yml parameters: ServiceDirectory: '${{ parameters.ServiceDirectory }}' + SubscriptionConfiguration: $(SubscriptionConfiguration) - ${{ parameters.PreRunSteps }} @@ -112,6 +113,7 @@ jobs: - template: /eng/common/TestResources/remove-test-resources.yml parameters: ServiceDirectory: '${{ parameters.ServiceDirectory }}' + SubscriptionConfiguration: $(SubscriptionConfiguration) - task: PublishTestResults@2