Re-enable agent OS verification (#1624)

* Re-enable agent OS verification
2021-02-16 15:53:56 +11:00 · 2021-02-16 15:53:56 +11:00 · b68a20e3d2
commit b68a20e3d2
parent 74bfafcb52
3 changed files with 32 additions and 41 deletions
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@ -17,12 +17,6 @@ parameters:
  - name: CoverageReportPath
    type: string
    default: 'sdk/*/*/*cov_xml.xml'
-  - name: WindowsPool
-    type: string
-    default: azsdk-pool-mms-win-2019-general
-  - name: LinuxPool
-    type: string
-    default: azsdk-pool-mms-ubuntu-1804-general

 jobs:
 - job: Validate
@ -30,30 +24,30 @@ jobs:
  strategy:
    matrix:
      Linux_x64_gcc8:
-        Pool: $(LinuxPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-ubuntu-1804-general
+        OSVmImage: MMSUbuntu18.04
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-linux'
        CC: '/usr/bin/gcc-8'
        CXX: '/usr/bin/g++-8'
        BuildArgs: '-j 10'
      Linux_x64_gcc9:
-        Pool: $(LinuxPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-ubuntu-1804-general
+        OSVmImage: MMSUbuntu18.04
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-linux'
        CC: '/usr/bin/gcc-9'
        CXX: '/usr/bin/g++-9'
        BuildArgs: '-j 10'
      Linux_x64:
-        Pool: $(LinuxPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-ubuntu-1804-general
+        OSVmImage: MMSUbuntu18.04
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-linux'
        BuildArgs: '-j 10'
      Win_x86:
-        Pool: $(WindowsPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-win-2019-general
+        OSVmImage: MMS2019
        VcpkgInstall: 'curl[winssl] libxml2'
        VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
        CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -61,15 +55,15 @@ jobs:
        CmakeArgs: ' -DBUILD_TRANSPORT_CURL=ON' #Leaving curl on here to explicitly test what the default behavior is on windows.
        BuildArgs: '-v --parallel 8'
      Win_x64:
-        Pool: $(WindowsPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-win-2019-general
+        OSVmImage: MMS2019
        VcpkgInstall: 'curl[winssl] libxml2'
        VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
        CMAKE_GENERATOR: 'Visual Studio 16 2019'
        CMAKE_GENERATOR_PLATFORM: x64
        BuildArgs: '-v --parallel 8'
      MacOS_x64:
-        Pool:
+        Pool: Azure Pipelines
        OSVmImage: 'macOS-10.14'
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-osx'
@ -77,8 +71,8 @@ jobs:

      # Unit testing ON
      Linux_x64_with_unit_test:
-        Pool: $(LinuxPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-ubuntu-1804-general
+        OSVmImage: MMSUbuntu18.04
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-linux'
        CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_CODE_COVERAGE=ON'
@ -88,15 +82,15 @@ jobs:
        CODE_COVERAGE_COLLECT_ONLY: 1
        BuildArgs: '-j 10'
      Linux_x64_with_unit_test_release:
-        Pool: $(LinuxPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-ubuntu-1804-general
+        OSVmImage: MMSUbuntu18.04
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-linux'
        CmakeArgs: ' -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON'
        BuildArgs: '-j 10'        
      Win_x86_with_unit_test:
-        Pool: $(WindowsPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-win-2019-general
+        OSVmImage: MMS2019
        VcpkgInstall: 'curl[winssl] libxml2'
        VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
        CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -104,8 +98,8 @@ jobs:
        CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_TRANSPORT_WINHTTP=ON'
        BuildArgs: '-v --parallel 8'
      Win_x64_with_unit_test:
-        Pool: $(WindowsPool)
-        OSVmImage:
+        Pool: azsdk-pool-mms-win-2019-general
+        OSVmImage: MMS2019
        VcpkgInstall: 'curl[winssl] libxml2'
        VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
        CMAKE_GENERATOR: 'Visual Studio 16 2019'
@ -113,14 +107,14 @@ jobs:
        CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_TRANSPORT_WINHTTP=ON'
        BuildArgs: '-v --parallel 8'
      MacOS_x64_with_unit_test:
-        Pool:
+        Pool: Azure Pipelines
        OSVmImage: 'macOS-10.14'
        VcpkgInstall: 'curl[ssl] libxml2 openssl'
        VCPKG_DEFAULT_TRIPLET: 'x64-osx'
        CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON'
  pool:
-    name: $[coalesce(variables['Pool'], '')]
-    vmImage: $[coalesce(variables['OSVmImage'], '')]
+    name: $(Pool)
+    vmImage: $(OSVmImage)

  variables:
  - name: CMOCKA_XML_FILE
@ -129,15 +123,15 @@ jobs:
    value: "xml"
  - name: BuildArgs
    value: ""
-  - name: WindowsPool
-    value: ${{parameters.WindowsPool}}
-  - name: LinuxPool
-    value: ${{parameters.LinuxPool}}

  steps:
  - checkout: self
    submodules: recursive

+  - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
+    parameters:
+      AgentImage: $(OSVmImage)
+
  # Validate all the files are formatted correctly according to the
  # .clang-format file. This step is macOS only to use clang-format-11
  - bash: |
@ -209,7 +203,8 @@ jobs:
 - ${{ if ne(parameters.ServiceDirectory, 'not-specified' )}}:
  - job: GenerateReleaseArtifacts
    pool:
-      name: ${{ parameters.WindowsPool }}
+      name: azsdk-pool-mms-win-2019-general
+      vmImage: MMS2019
    variables:
      VcpkgDependencies: curl[winssl] libxml2
      VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
--- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@ -99,6 +99,10 @@ jobs:
  - checkout: self
    submodules: recursive

+  - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
+    parameters:
+      AgentImage: $(OSVmImage)
+
  - template: /eng/common/pipelines/templates/steps/bypass-local-dns.yml

  # Install apt dependencies (if appropriate)
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@ -23,12 +23,6 @@ parameters:
 - name: CoverageReportPath
  type: string
  default: 'sdk/*/*/*cov_xml.xml'
- name: WindowsPool
-  type: string
-  default: azsdk-pool-mms-win-2019-general
- name: LinuxPool
-  type: string
-  default: azsdk-pool-mms-ubuntu-1804-general
 - name: LiveTestTimeoutInMinutes
  type: number
  default: 60
@ -43,8 +37,6 @@ stages:
          CtestRegex: ${{ parameters.CtestRegex }}
          Coverage: ${{ parameters.Coverage }}
          CoverageReportPath: ${{ parameters.CoverageReportPath }}
-          WindowsPool: ${{ parameters.WindowsPool }}
-          LinuxPool: ${{ parameters.LinuxPool }}

  - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(parameters.LiveTestCtestRegex, '')) }}:
    - stage: LiveTest