update core so we can run it

eng/pipelines/templates/jobs/archetype-sdk-client.yml

@@ -52,7 +52,7 @@ parameters:
     default: true
 
 jobs:
-  - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
+  - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
     parameters:
       GenerateJobName: ${{ parameters.JobName }}_generate_matrix
       MatrixConfigs:
@@ -61,6 +61,8 @@ jobs:
           Selection: all
           GenerateVMJobs: true
       JobTemplatePath: /eng/pipelines/templates/jobs/ci.tests.yml
+      OsVmImage: $(LINUXVMIMAGE)
+      Pool: $(LINUXPOOL)
       AdditionalParameters:
         DisplayName: ${{ parameters.JobName }}
         Artifacts: ${{ parameters.Artifacts }}
@@ -82,8 +84,9 @@ jobs:
       - job:
         displayName: Create API Review for ${{ artifact.name }}
         pool:
-          name: azsdk-pool-mms-win-2022-general
+          name: $(WINDOWSPOOL)
-          vmImage: windows-2022
+          image: $(WINDOWSVMIMAGE)
+          os: windows
         steps:
           - task: Powershell@2
             inputs:
@@ -141,8 +144,9 @@ jobs:
 
     - job: GenerateReleaseArtifacts
       pool:
-        name: azsdk-pool-mms-win-2022-general
+        name: $(WINDOWSPOOL)
-        vmImage: windows-2022
+        image: $(WINDOWSVMIMAGE)
+        os: windows
       variables:
         VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
         Package.EnableSBOMSigning: true
@@ -328,17 +332,14 @@ jobs:
               continueOnError: true
               condition: and(succeeded(), eq(variables['VerifyChangeLogForRelease'], 'true'))
 
-        - task: PublishPipelineArtifact@1
+        - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
-          inputs:
+          parameters:
-            artifactName: packages
+            ArtifactPath: $(Build.ArtifactStagingDirectory)/packages
-            path: $(Build.ArtifactStagingDirectory)/packages
+            ArtifactName: packages
 
-        # After all docs artifacts are generated publish docs artifacts
+        - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
-        - task: PublishPipelineArtifact@1
+          parameters:
-          inputs:
+            ArtifactPath: $(Build.ArtifactStagingDirectory)/docs
-            artifactName: docs
+            ArtifactName: docs
-            path: $(Build.ArtifactStagingDirectory)/docs
 
         - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml
-
-        - template: /eng/pipelines/templates/steps/generate-and-publish-sbom.yml

eng/pipelines/templates/jobs/ci.tests.yml

@@ -55,10 +55,12 @@ parameters:
   - name: DisplayName
     type: string
     default: Validate
-
+  - name: OSName
+    type: string
+    default: ''
 
 jobs:
-  - job:
+  - job: ${{ parameters.DisplayName }}_${{ parameters.OSName }}
     displayName: ${{ parameters.DisplayName }}
     dependsOn: ${{ parameters.DependsOn }}
     condition: and(succeededOrFailed(), ne(variables['Skip.Test'], 'true'), ne(${{ parameters.Matrix }}, '{}'))
@@ -66,8 +68,14 @@ jobs:
       matrix: $[ ${{ parameters.Matrix }} ]
       maxParallel: 12
     pool:
-      vmImage: $(OSVmImage)
       name: $(Pool)
+      # 1es pipeline templates converts `image` to demands: ImageOverride under the hood
+      # which is incompatible with image selection in the default non-1es hosted pools
+      ${{ if eq(parameters.OSName, 'macOS') }}:
+        vmImage: $(OSVmImage)
+      ${{ else }}:
+        image: $(OSVmImage)
+      os: ${{ parameters.OSName }}
     variables:
     - name: CMOCKA_XML_FILE
       value: "%g-test-results.xml"
@@ -99,7 +107,7 @@ jobs:
     steps:
       - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
         parameters:
-          AgentImage: $(OsVmImage)
+          AgentImage: ${{ parameters.OSName }}
 
       - template: /eng/pipelines/templates/steps/fix-1es-image-apt-azure-sources.yml
 
@@ -320,23 +328,10 @@ jobs:
         condition: eq(variables['PublishMapFiles'], 'true')
         displayName: Stage map files
 
-      - task: PublishPipelineArtifact@1
+      - template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml
-        inputs:
-          artifactName: map-files-$(MapFileArtifactName)
-          path: $(Build.ArtifactStagingDirectory)
-        condition: eq(variables['PublishMapFiles'], 'true')
-        displayName : Publish map file artifacts
-        
-      - pwsh: |
-          $artifactName = "$(Agent.JobName)"
-          $parts = $artifactName -split ' '
-          if ($parts[1]) {
-            $artifactName = $parts[1]
-          }
-          Write-Host "##vso[task.setvariable variable=BomArtifactName;]$artifactName"
-        displayName: Set bom file artifact name
-        condition: succeededOrFailed()
-
-      - template: /eng/pipelines/templates/steps/generate-and-publish-sbom.yml
         parameters:
-          BomArtifactName: $(BomArtifactName)
+          ArtifactPath: $(Build.ArtifactStagingDirectory)
+          ArtifactName: map-files-$(MapFileArtifactName)
+          CustomCondition: eq(variables['PublishMapFiles'], 'true')
+          SbomEnabled: false
+

eng/pipelines/templates/jobs/cmake-generate-jobs.yml

@@ -19,7 +19,7 @@ parameters:
     default: 120
 
 jobs:
-- template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
+- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
   parameters:
     MatrixConfigs:
       - Name: base
@@ -27,13 +27,15 @@ jobs:
         Selection: all
         GenerateVMJobs: true
     JobTemplatePath: /eng/pipelines/templates/jobs/cmake-generate.tests.yml
+    OsVmImage: $(LINUXVMIMAGE)
+    Pool: $(LINUXPOOL)
     GenerateJobName: generate_matrix_cmake
     AdditionalParameters:
       Artifacts: ${{ parameters.Artifacts }}
       ServiceDirectory: ${{ parameters.ServiceDirectory }}
       CMakeTestOptions: ${{ parameters.CMakeTestOptions }}
 
-- template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
+- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
   parameters:
     MatrixConfigs:
       - Name: base
@@ -41,6 +43,8 @@ jobs:
         Selection: all
         GenerateVMJobs: true
     JobTemplatePath: /eng/pipelines/templates/jobs/cmake-generate.tests.yml
+    OsVmImage: $(LINUXVMIMAGE)
+    Pool: $(LINUXPOOL)
     GenerateJobName: generate_matrix_cmake_source
     AdditionalParameters:
       Artifacts: ${{ parameters.ArtifactsSource }}

eng/pipelines/templates/jobs/cmake-generate.tests.yml

@@ -31,9 +31,13 @@ parameters:
   - name: TimeoutInMinutes
     type: number
     default: 120
+  - name: OSName
+    type: string
+    default: ''
 
 jobs:
-- job: ${{ parameters.JobName }}
+- job:
+  displayName: ${{ parameters.JobName }}
   timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
   condition: >-
     and(
@@ -48,7 +52,13 @@ jobs:
 
   pool:
     name: $(Pool)
+    # 1es pipeline templates converts `image` to demands: ImageOverride under the hood
+    # which is incompatible with image selection in the default non-1es hosted pools
+    ${{ if eq(parameters.OSName, 'macOS') }}:
       vmImage: $(OSVmImage)
+    ${{ else }}:
+      image: $(OSVmImage)
+    os: ${{ parameters.OSName }}
 
   ${{ if eq(parameters.UsePlatformContainer, 'true') }}:
     # Add a default so the job doesn't fail when the matrix is empty

eng/pipelines/templates/jobs/live.tests.yml

@@ -39,15 +39,26 @@ parameters:
 - name: PostTestSteps
   type: stepList
   default: []
+- name: OSName
+  type: string
+  default: ''
 
 jobs:
-- job: ValidateLive
+- job:
+  displayName: ValidateLive
   dependsOn: ${{ parameters.DependsOn }}
   condition: and(ne(variables['Skip.LiveTest'], 'true'), ne(${{ parameters.Matrix }}, '{}'))
   timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
   pool:
     name: $(Pool)
+    # 1es pipeline templates converts `image` to demands: ImageOverride under the hood
+    # which is incompatible with image selection in the default non-1es hosted pools
+    ${{ if eq(parameters.OSName, 'macOS') }}:
       vmImage: $(OSVmImage)
+    ${{ else }}:
+      image: $(OSVmImage)
+    os: ${{ parameters.OSName }}
+    
 
   ${{ if eq(parameters.UsePlatformContainer, 'true') }}:
     # Add a default so the job doesn't fail when the matrix is empty
@@ -58,18 +69,30 @@ jobs:
     matrix: $[ ${{ parameters.Matrix }} ]
 
   variables:
-    CMOCKA_XML_FILE: "%g-test-results.xml"
+    - template: /eng/pipelines/templates/variables/image.yml@self
-    CMOCKA_MESSAGE_OUTPUT: "xml"
+    - name: CMOCKA_XML_FILE
-    AZURE_ENABLE_STATIC_ANALYSIS: 1
+      value: "%g-test-results.xml"
-    BuildArgs: ""
+    - name: CMOCKA_MESSAGE_OUTPUT
-    VcpkgArgs: ""
+      value: "xml"
-    WindowsCtestConfig: ""
+    - name: AZURE_ENABLE_STATIC_ANALYSIS
-    CmakeEnvArg: ""
+      value: 1
-    CmakeArgs: ""
+    - name: BuildArgs
-    AZURE_TEST_MODE: "LIVE"
+      value: ""
-    AZURE_LOG_LEVEL: "verbose"
+    - name: VcpkgArgs
+      value: ""
+    - name: WindowsCtestConfig
+      value: ""
+    - name: CmakeEnvArg
+      value: ""
+    - name: CmakeArgs
+      value: ""
+    - name: AZURE_TEST_MODE
+      value: "LIVE"
+    - name: AZURE_LOG_LEVEL
+      value: "verbose"
       # Surface the ServiceDirectory parameter as an environment variable so tests can take advantage of it.
-    AZURE_SERVICE_DIRECTORY: ${{ parameters.ServiceDirectory }}
+    - name: AZURE_SERVICE_DIRECTORY
+      value: ${{ parameters.ServiceDirectory }}
 
   steps:
   - checkout: self

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -1,3 +1,10 @@
+resources:
+  repositories:
+    - repository: 1ESPipelineTemplates
+      type: git
+      name: 1ESPipelineTemplates/1ESPipelineTemplates
+      ref: refs/tags/release
+
 parameters:
   - name: ServiceDirectory
     type: string
@@ -77,10 +84,39 @@ parameters:
     type: number
     default: 120
 
+extends:
+  ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  ${{ else }}:
+    template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    settings:
+      skipBuildTagsForGitHubPullRequests: true
+    sdl:
+      sourceAnalysisPool:
+        name: azsdk-pool-mms-win-2022-general
+        image: azsdk-pool-mms-win-2022-1espt
+        os: windows
+      eslint:
+        enabled: false
+        justificationForDisabling: 'ESLint injected task has failures because it uses an old version of mkdirp. We should not fail for tools not controlled by the repo. See: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=3499746'
+      psscriptanalyzer:
+        compiled: true
+        break: true
+      policy: M365
+      credscan:
+        suppressionsFile: $(Build.SourcesDirectory)/eng/CredScanSuppression.json
+        toolVersion: 2.3.12.23
+      binskim:
+        enabled: true
+        scanOutputDirectoryOnly: true
+
     stages:
       - stage: CMakeGeneration
+        variables:
+          - template: /eng/pipelines/templates/variables/image.yml@self
         jobs:
-      - template: /eng/pipelines/templates/jobs/cmake-generate-jobs.yml
+          - template: /eng/pipelines/templates/jobs/cmake-generate-jobs.yml@self
             parameters:
               TimeoutInMinutes: ${{ parameters.CMakeGenerationTimeoutInMinutes }}
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
@@ -92,9 +128,11 @@ stages:
       # PrePublishBuild runs a narrower set of fast builds. If these builds pass,
       # Integration can launch immediately without awaiting more build and test jobs
       - stage: PrePublishBuild
+        variables:
+          - template: /eng/pipelines/templates/variables/image.yml@self
         dependsOn: []
         jobs:
-      - template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
+          - template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml@self
             parameters:
               MatrixFile: eng/pipelines/templates/stages/platform-matrix-quick.json
               JobName: QuickValidate
@@ -114,9 +152,12 @@ stages:
               RunMetaJobs: true
 
       - stage: Build
+        variables:
+          - template: /eng/pipelines/templates/variables/image.yml@self
         dependsOn: []
         jobs:
-      - template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
+          - template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml@self
+            # Code coverage is enabled by default for live tests
             parameters:
               MatrixFile: eng/pipelines/templates/stages/platform-matrix.json
               JobName: Validate
@@ -136,8 +177,7 @@ stages:
               RunMetaJobs: false
 
       - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(parameters.LiveTestCtestRegex, '')) }}:
-    - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
+          - template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml@self
-      # Code coverage is enabled by default for live tests
             parameters:
               TimeoutInMinutes: ${{ parameters.LiveTestTimeoutInMinutes }}
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
@@ -152,7 +192,7 @@ stages:
               PostTestSteps: ${{ parameters.PostTestSteps }}
 
       - ${{ if and(eq(variables['System.TeamProject'], 'internal'), not(endsWith(variables['Build.DefinitionName'], ' - tests'))) }}:
-    - template: archetype-cpp-release.yml
+          - template: archetype-cpp-release.yml@self
             parameters:
               ServiceDirectory: ${{ parameters.ServiceDirectory }}
               IntegrationDependsOn:
@@ -171,3 +211,4 @@ stages:
               ArtifactName: packages
               ${{ if eq(parameters.ServiceDirectory, 'template') }}:
                 TestPipeline: true
+

eng/pipelines/templates/stages/archetype-sdk-tests.yml

@@ -43,7 +43,7 @@ stages:
       - stage: LiveTest_${{ cloud.key }}
         dependsOn: []
         jobs:
-          - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
+          - template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
             parameters:
               MatrixConfigs:
                 - Name: base
@@ -51,6 +51,8 @@ stages:
                   Selection: all
                   GenerateVMJobs: true
               JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
+              OsVmImage: $(LINUXVMIMAGE)
+              Pool: $(LINUXPOOL)
               CloudConfig:
                 SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
                 SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}

eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json

@@ -3,19 +3,19 @@
     "CmakeEnvArg": "",
     "OSConfig": {
       "Linux": {
-        "Pool": "azsdk-pool-mms-ubuntu-2204-general",
+        "Pool": "env:LINUXNEXTPOOL",
-        "OSVmImage": "MMSUbuntu22.04",
+        "OSVmImage": "env:LINUXNEXTVMIMAGE",
         "AptDependencies": "libcurl4-openssl-dev",
         "VCPKG_DEFAULT_TRIPLET": "x64-linux"
       },
       "Windows": {
-        "Pool": "azsdk-pool-mms-win-2022-general",
+        "Pool": "env:WINDOWSPOOL",
-        "OSVmImage": "windows-2022",
+        "OSVmImage": "env:WINDOWSVMIMAGE",
         "VCPKG_DEFAULT_TRIPLET": "x64-windows"
       },
       "Mac": {
-        "Pool": "Azure Pipelines",
+        "Pool": "env:MACPOOL",
-        "OSVmImage": "macos-11",
+        "OSVmImage": "env:MACVMIMAGE",
         "VCPKG_DEFAULT_TRIPLET": "x64-osx"
       }
     }

eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json

@@ -2,19 +2,19 @@
   "matrix": {
     "OSConfig": {
       "Windows": {
-        "Pool": "azsdk-pool-mms-win-2022-general",
+        "Pool": "env:WINDOWSPOOL",
-        "OSVmImage": "windows-2022",
+        "OSVmImage": "env:WINDOWSVMIMAGE",
         "CmakeEnvArg": ""
       },
       "Linux": {
-        "Pool": "azsdk-pool-mms-ubuntu-2204-general",
+        "Pool": "env:LINUXNEXTPOOL",
-        "OSVmImage": "MMSUbuntu22.04",
+        "OSVmImage": "env:LINUXNEXTVMIMAGE",
         "CmakeEnvArg": "",
         "AptDependencies": "libcurl4-openssl-dev"
       },
       "Mac": {
-        "Pool": "Azure Pipelines",
+        "Pool": "env:MACPOOL",
-        "OSVmImage": "macos-11",
+        "OSVmImage": "env:MACVMIMAGE",
         "CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
         "BrewDependencies": "openssl"
       }

eng/pipelines/templates/stages/platform-matrix-live.json

@@ -6,8 +6,8 @@
     {
       "StaticConfigs": {
         "macOS-11": {
-          "Pool": "Azure Pipelines",
+          "Pool": "env:MACPOOL",
-          "OSVmImage": "macos-11",
+          "OSVmImage": "env:MACVMIMAGE",
           "VCPKG_DEFAULT_TRIPLET": "x64-osx",
           "BuildArgs": "-j 4"
         }
@@ -24,8 +24,8 @@
         "Ubu2204": {
           "VCPKG_DEFAULT_TRIPLET": "x64-linux",
           "BuildArgs": "-j 4",
-          "Pool": "azsdk-pool-mms-ubuntu-2204-general",
+          "Pool": "env:LINUXNEXTPOOL",
-          "OSVmImage": "MMSUbuntu22.04",
+          "OSVmImage": "env:LINUXNEXTVMIMAGE",
           "RunProxyTests": true
         }
       },
@@ -43,8 +43,8 @@
       "StaticConfigs": {
         "Ubu20": {
           "BuildArgs": "-j 4",
-          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+          "Pool": "env:LINUXPOOL",
-          "OSVmImage": "MMSUbuntu20.04",
+          "OSVmImage": "env:LINUXVMIMAGE",
           "VCPKG_DEFAULT_TRIPLET": "x64-linux",
           "RunProxyTests": true
         }
@@ -66,13 +66,13 @@
     {
       "StaticConfigs": {
         "Win2019": {
-          "Pool": "azsdk-pool-mms-win-2019-general",
+          "Pool": "env:WINDOWSPREVIOUSPOOL",
-          "OSVmImage": "windows-2019",
+          "OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
           "CMAKE_GENERATOR": "Visual Studio 16 2019"
         },
         "Win2022": {
-          "Pool": "azsdk-pool-mms-win-2022-general",
+          "Pool": "env:WINDOWSPOOL",
-          "OSVmImage": "windows-2022",
+          "OSVmImage": "env:WINDOWSVMIMAGE",
           "CMAKE_GENERATOR": "Visual Studio 17 2022"
         }
       },
@@ -122,8 +122,8 @@
     {
       "StaticConfigs": {
         "Win2022": {
-          "Pool": "azsdk-pool-mms-win-2022-general",
+          "Pool": "env:WINDOWSPOOL",
-          "OSVmImage": "windows-2022",
+          "OSVmImage": "env:WINDOWSVMIMAGE",
           "CMAKE_GENERATOR": "Visual Studio 17 2022",
           "RunProxyTests": true
         }

eng/pipelines/templates/stages/platform-matrix-quick.json

@@ -6,8 +6,8 @@
           {
             "StaticConfigs": {
               "Ubuntu22": {
-                "OSVmImage": "MMSUbuntu22.04",
+                "OSVmImage": "env:LINUXNEXTVMIMAGE",
-                "Pool": "azsdk-pool-mms-ubuntu-2204-general",
+                "Pool": "env:LINUXNEXTPOOL",
                 "VCPKG_DEFAULT_TRIPLET": "x64-linux",
                 "BuildArgs": "-j 10",
                 "RunProxyTests": true

eng/pipelines/templates/stages/platform-matrix.json

@@ -6,13 +6,13 @@
     {
       "OSConfiguration": {
         "macOS-11": {
-          "OSVmImage": "macos-11",
+          "OSVmImage": "env:MACVMIMAGE",
           "XCODE_VERSION": "12.5.1"
         }
       },
       "StaticConfigs": {
         "_": {
-          "Pool": "Azure Pipelines",
+          "Pool": "env:MACPOOL",
           "BuildArgs": "-j 10",
           "VCPKG_DEFAULT_TRIPLET": "x64-osx",
           "CmakeArgs": " -DBUILD_TESTING=ON -DENABLE_PROXY_TESTS=OFF -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON",
@@ -31,8 +31,8 @@
     {
       "StaticConfigs": {
         "Win2019_x64_Release": {
-          "OSVmImage": "windows-2019",
+          "OSVmImage": "env:WINDOWSPREVIOUSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2019-general",
+          "Pool": "azsdk-pool-mms-win-2019-1es-pt",
           "CMAKE_GENERATOR": "Visual Studio 16 2019",
           "CMAKE_GENERATOR_PLATFORM": "x64",
           "VCPKG_DEFAULT_TRIPLET": "x64-windows-static",
@@ -49,8 +49,8 @@
     {
       "StaticConfigs": {
         "Win2022": {
-          "OSVmImage": "windows-2022",
+          "OSVmImage": "env:WINDOWSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2022-general",
+          "Pool": "env:WINDOWSPOOL",
           "CMAKE_GENERATOR": "Visual Studio 17 2022"
         }
       },
@@ -78,8 +78,8 @@
     {
       "StaticConfigs": {
         "Win2022": {
-          "OSVmImage": "windows-2022",
+          "OSVmImage": "env:WINDOWSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2022-general",
+          "Pool": "env:WINDOWSPOOL",
           "RunProxyTests": true,
           "CMAKE_GENERATOR": "Visual Studio 17 2022"
         }
@@ -111,8 +111,8 @@
       "StaticConfigs": {
         "Win2022": {
           "VcpkgInstall": "openssl",
-          "OSVmImage": "windows-2022",
+          "OSVmImage": "env:WINDOWSVMIMAGE",
-          "Pool": "azsdk-pool-mms-win-2022-general",
+          "Pool": "env:WINDOWSPOOL",
           "CMAKE_GENERATOR": "Visual Studio 17 2022",
           "PublishMapFiles": "true"
         }
@@ -141,8 +141,8 @@
     {
       "StaticConfigs": {
         "Ubuntu22": {
-          "OSVmImage": "MMSUbuntu22.04",
+          "OSVmImage": "env:LINUXNEXTVMIMAGE",
-          "Pool": "azsdk-pool-mms-ubuntu-2204-general",
+          "Pool": "env:LINUXNEXTPOOL",
           "VCPKG_DEFAULT_TRIPLET": "x64-linux",
           "BuildArgs": "-j 10",
           "RunProxyTests": true
@@ -190,8 +190,8 @@
     {
       "StaticConfigs": {
         "Ubuntu20": {
-          "OSVmImage": "MMSUbuntu20.04",
+          "OSVmImage": "env:LINUXVMIMAGE",
-          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+          "Pool": "env:LINUXPOOL",
           "VCPKG_DEFAULT_TRIPLET": "x64-linux",
           "BuildArgs": "-j 10",
           "RunProxyTests": true
@@ -208,8 +208,8 @@
     {
       "StaticConfigs": {
         "Ubuntu20": {
-          "OSVmImage": "MMSUbuntu20.04",
+          "OSVmImage": "env:LINUXVMIMAGE",
-          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+          "Pool": "env:LINUXPOOL",
           "VCPKG_DEFAULT_TRIPLET": "x64-linux",
           "BuildArgs": "-j 10",
           "CC": "/usr/bin/clang-11",

eng/pipelines/templates/variables/image.yml

@@ -0,0 +1,33 @@
+# Default pool image selection. Set as variable so we can override at pipeline level
+
+variables:
+  - name: LINUXPOOL
+    value: azsdk-pool-mms-ubuntu-2004-general
+  - name: LINUXNEXTPOOL
+    value: azsdk-pool-mms-ubuntu-2204-general
+  - name: WINDOWSPOOL
+    value: azsdk-pool-mms-win-2022-general
+  - name: WINDOWSPREVIOUSPOOL
+    value: azsdk-pool-mms-win-2019-general
+  - name: MACPOOL
+    value: Azure Pipelines
+
+  - name: LINUXVMIMAGE
+    value: azsdk-pool-mms-ubuntu-2004-1espt
+  - name: LINUXNEXTVMIMAGE
+    value: azsdk-pool-mms-ubuntu-2204-1espt
+  - name: WINDOWSVMIMAGE
+    value: azsdk-pool-mms-win-2022-1espt
+  - name: WINDOWSPREVIOUSVMIMAGE
+    value: azsdk-pool-mms-win-2019-1espt
+  - name: MACVMIMAGE
+    value: macos-11
+
+  # Values required for pool.os field in 1es pipeline templates
+  - name: LINUXOS
+    value: linux
+  - name: WINDOWSOS
+    value: windows
+  - name: MACOS
+    value: macOS
+

eng/scripts/Get-BinarySizes.ps1

@@ -48,23 +48,23 @@ function getTargetOs {
         return $OsVMImage
     }
 
-    if ($OsVMImage -eq "windows-2019") {
+    if ($OsVMImage -eq "windows-2019" -or $OsVMImage.Contains("win-2019")) {
         return "win-2019"
     }
 
-    if ($OsVMImage -eq "windows-2022") {
+    if ($OsVMImage -eq "windows-2022" -or $OsVMImage.Contains("win-2022")) {
         return "win-2022"
     }
 
-    if ($OsVMImage -in "MMSUbuntu18.04", "ubuntu-18.04") {
+    if ($OsVMImage -in "MMSUbuntu18.04", "ubuntu-18.04", "azsdk-pool-mms-ubuntu-1804-1espt") {
         return "ubuntu-18.04"
     }
 
-    if ($OsVMImage -in "MMSUbuntu20.04", "ubuntu-20.04") {
+    if ($OsVMImage -in "MMSUbuntu20.04", "ubuntu-20.04", "azsdk-pool-mms-ubuntu-2004-1espt") {
         return "ubuntu-20.04"
     }
 
-    if ($OsVMImage -in "MMSUbuntu22.04", "ubuntu-22.04") {
+    if ($OsVMImage -in "MMSUbuntu22.04", "ubuntu-22.04", "azsdk-pool-mms-ubuntu-2204-1espt") {
         return "ubuntu-22.04"
     }
 
@@ -97,11 +97,11 @@ function getToolChain {
         return "MSVC"
     }
 
-	if ($OSVmImage -match "windows-\d{4}") {
+	if ($OSVmImage -match "windows-\d{4}" -or $OSVmImage -match "win-\d{4}") {
         return "MSVC17"
     }
 
-    if ($OSVmImage.Contains("Ubuntu")) {
+    if ($OSVmImage.Contains("Ubuntu") -or $OSVmImage.Contains("ubuntu")) {
         if ($CmakeEnvArg.Contains('g++-5')) {
             return 'g++-5'
         } elseif ($env:CXX -and $env:CXX.Contains("g++8")) {
@@ -121,7 +121,7 @@ function getTargetPlatform {
         return "macos"
     }
 
-    if ($OSVmImage -match 'MMS\d{4}' -or $OsVMImage -match "windows-\d{4}") {
+    if ($OSVmImage -match 'MMS\d{4}' -or $OsVMImage -match "windows-\d{4}" -or $OsVMImage -match "win-\d{4}") {
         if (!$env:CMAKE_SYSTEM_NAME -and !$CmakeArgs.Contains('WindowsStore')) {
             return 'win32'
         } elseif ($env:CMAKE_SYSTEM_NAME -eq 'WindowsStore' -or $CmakeArgs.Contains('WindowsStore')) {
@@ -129,7 +129,7 @@ function getTargetPlatform {
         }
     }
 
-    if ($OSVmImage.Contains("Ubuntu")) {
+    if ($OSVmImage.Contains("Ubuntu") -or $OSVmImage.Contains("ubuntu")) {
         return 'linux'
     }
 

sdk/core/ci.yml

@@ -41,8 +41,8 @@ pr:
       - '*.md'
       - /**/*.md
 
-stages:
+extends:
-  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
       ServiceDirectory: core
       # CI has static code analysis disabled, while LiveTest will have it enabled

sdk/storage/ci.yml

@@ -22,8 +22,8 @@ pr:
       - sdk/storage
       - eng/common/testproxy
 
-stages:
+extends:
-  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
       ServiceDirectory: storage
       # Not running tests on CI but only on LiveTest mode

sdk/template/ci.yml

@@ -22,8 +22,8 @@ pr:
     include:
       - sdk/template
 
-stages:
+extends:
-  - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
+    template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
       ServiceDirectory: template
       CtestRegex: azure-template