Re-enable OS verification. (Azure#16595)

* Re-enable OS verification.
msyyc · Feb 15, 2021 · df1cd2b · df1cd2b
1 parent 108c757
commit df1cd2b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 36 deletions.
diff --git 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,20 +83,15 @@ 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'
     variables:
     - 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
@@ -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
@@ -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
@@ -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'))}}: