From df1cd2bdfd15470f1ad77f07fd39361776a10af7 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 16 Feb 2021 09:06:26 +1100 Subject: [PATCH] Re-enable OS verification. (#16595) * Re-enable OS verification. --- .../templates/jobs/archetype-sdk-client.yml | 53 +++++++++---------- .../templates/jobs/archetype-sdk-tests.yml | 3 ++ eng/pipelines/templates/jobs/smoke-test.yml | 18 +++++++ .../templates/stages/archetype-sdk-client.yml | 8 --- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 786a8c092eac..1ee6d83fecc1 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -36,44 +36,44 @@ parameters: type: object default: Linux_Python27: - Pool: $(LinuxPool) - OSVmImage: + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '2.7' CoverageArg: '--disablecov' RunForPR: true Linux_Python35: - Pool: $(LinuxPool) - OSVmImage: + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.5' CoverageArg: '--disablecov' RunForPR: false Linux_Python38: - Pool: $(LinuxPool) - OSVmImage: + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.8' CoverageArg: '--disablecov' RunForPR: true Windows_Python35: - Pool: $(WindowsPool) - OSVmImage: + Pool: azsdk-pool-mms-win-2019-general + OSVmImage: MMS2019 PythonVersion: '3.5' CoverageArg: '--disablecov' RunForPR: true MacOS_Python27: - Pool: + Pool: Azure Pipeliens OSVmImage: 'macOS-10.15' PythonVersion: '2.7' CoverageArg: '--disablecov' RunForPR: false Linux_pypy3: - Pool: $(LinuxPool) - OSVmImage: + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: 'pypy3' CoverageArg: '--disablecov' RunForPR: false Linux_Python39: - Pool: $(LinuxPool) - OSVmImage: + Pool: azsdk-pool-mms-ubuntu-1804-general + OSVmImage: MMSUbuntu18.04 PythonVersion: '3.9' CoverageArg: '' RunForPR: true @@ -83,12 +83,6 @@ parameters: - name: DevFeedName type: string default: 'public/azure-sdk-for-python' - - name: WindowsPool - type: string - default: azsdk-pool-mms-win-2019-general - - name: LinuxPool - type: string - default: azsdk-pool-mms-ubuntu-1804-general jobs: - job: 'Build' @@ -96,7 +90,8 @@ jobs: - template: ../variables/globals.yml pool: - name: ${{ parameters.LinuxPool }} + name: azsdk-pool-mms-ubuntu-1804-general + vmImage: MMSUbuntu18.04 steps: - template: ../steps/build-artifacts.yml @@ -120,7 +115,8 @@ jobs: - 'Build' pool: - name: ${{ parameters.LinuxPool }} + name: azsdk-pool-mms-ubuntu-1804-general + vmImage: MMSUbuntu18.04 steps: - template: /eng/common/pipelines/templates/steps/verify-links.yml @@ -147,10 +143,6 @@ jobs: - template: ../variables/globals.yml - name: InjectedPackages value: ${{ parameters.InjectedPackages }} - - name: WindowsPool - value: ${{ parameters.WindowsPool }} - - name: LinuxPool - value: ${{ parameters.LinuxPool }} dependsOn: - 'Build' @@ -170,10 +162,14 @@ jobs: ${{ insert }}: ${{ matrixEntry.value }} pool: - name: $[coalesce(variables['Pool'], '')] - vmImage: $[coalesce(variables['OSVmImage'], '')] + name: $(Pool) + vmImage: $(OSVmImage) steps: + - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml + parameters: + AgentImage: $(OSVmImage) + - ${{if eq(parameters.TestPipeline, 'true')}}: - task: PowerShell@2 displayName: Prep template pipeline for release @@ -233,7 +229,8 @@ jobs: - 'Build' pool: - name: ${{ parameters.LinuxPool }} + name: azsdk-pool-mms-ubuntu-1804-general + vmImage: MMSUbuntu18.04 steps: - template: ../steps/test_regression.yml diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index c85be50b22c1..bd552430ae78 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -92,6 +92,9 @@ jobs: container: $[ variables['Container'] ] steps: + - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml + parameters: + AgentImage: $(OSVmImage) - template: /eng/common/pipelines/templates/steps/bypass-local-dns.yml - ${{ if eq(parameters['AllocateResourceGroup'], true) }}: diff --git a/eng/pipelines/templates/jobs/smoke-test.yml b/eng/pipelines/templates/jobs/smoke-test.yml index 95d235a5ac00..07f799f0625a 100644 --- a/eng/pipelines/templates/jobs/smoke-test.yml +++ b/eng/pipelines/templates/jobs/smoke-test.yml @@ -40,69 +40,82 @@ jobs: Python_27_Linux (AzureCloud): PythonVersion: '2.7' SkipAsyncInstall: true + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_37_Linux (AzureCloud): PythonVersion: '3.7' + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_38_Linux (AzureCloud): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_38_Linux (AzureCloud Canary): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview) ArmTemplateParameters: $(azureCloudArmParameters) Location: 'eastus2euap' Python_37_Windows (AzureCloud): PythonVersion: '3.7' + Pool: Azure Pipelines OSVmImage: windows-2019 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_38_Windows (AzureCloud): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: windows-2019 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_37_Mac (AzureCloud): PythonVersion: '3.7' + Pool: Azure Pipelines OSVmImage: macOS-10.15 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_38_Mac (AzureCloud): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: macOS-10.15 SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ArmTemplateParameters: $(azureCloudArmParameters) Python_38_Linux (AzureUSGovernment): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) Python_37_Windows (AzureUSGovernment): PythonVersion: '3.7' + Pool: Azure Pipelines OSVmImage: windows-2019 SubscriptionConfiguration: $(sub-config-gov-test-resources) ArmTemplateParameters: $(azureUSGovernmentArmParameters) Python_38_Linux (AzureChinaCloud): PythonVersion: '3.8' + Pool: Azure Pipelines OSVmImage: ubuntu-18.04 SubscriptionConfiguration: $(sub-config-cn-test-resources) Location: 'chinanorth' ArmTemplateParameters: $(azureChinaCloudArmParameters) Python_37_Windows (AzureChinaCloud): PythonVersion: '3.7' + Pool: Azure Pipelines OSVmImage: windows-2019 SubscriptionConfiguration: $(sub-config-cn-test-resources) Location: 'chinanorth' ArmTemplateParameters: $(azureChinaCloudArmParameters) pool: + name: $(Pool) vmImage: $(OSVmImage) variables: @@ -122,6 +135,11 @@ jobs: value: $(Build.SourcesDirectory)/common/smoketest/requirements-release.txt steps: + - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml + parameters: + AgentPool: $(Pool) + AgentImage: $(OSVmImage) + - task: UsePythonVersion@0 displayName: "Use Python $(PythonVersion)" inputs: diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index fbe5798236a4..70aa9122f2dd 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -35,12 +35,6 @@ parameters: - name: BuildTargetingString type: string default: azure-* -- name: WindowsPool - type: string - default: azsdk-pool-mms-win-2019-general -- name: LinuxPool - type: string - default: azsdk-pool-mms-ubuntu-1804-general stages: - stage: Build @@ -58,8 +52,6 @@ stages: AdditionalTestMatrix: ${{ parameters.AdditionalTestMatrix }} DevFeedName: ${{ parameters.DevFeedName }} BuildTargetingString: ${{ parameters.BuildTargetingString }} - WindowsPool: ${{ parameters.WindowsPool }} - LinuxPool: ${{ parameters.LinuxPool }} # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch. - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}: