update the AdvancedBuild yaml construct to work with the new 1es restrictions

Author: scbedd

eng/pipelines/templates/jobs/ci.yml

@@ -89,31 +89,34 @@ jobs:
           Artifacts: ${{ parameters.Artifacts }}
 
   - ${{ if eq(parameters['AdvancedBuild'], true) }}:
-    - job: 'Build'
+     - job: 'Build_Linux'
       timeoutInMinutes: 90
 
-      strategy:
-        matrix:
-          Linux:
-            imageName: azsdk-pool-mms-ubuntu-2004-1espt
-            poolname: azsdk-pool-mms-ubuntu-2004-general
-            ArtifactName: linux
-            os: linux
-          Windows:
-            imageName: azsdk-pool-mms-win-2022-1espt
-            poolName: azsdk-pool-mms-win-2022-1es-pt
-            ArtifactName: windows
-            os: windows
-          Mac:
-            imageName: macos-11
-            poolName: 'Azure Pipelines'
-            ArtifactName: mac
-            os: macos
+      pool:
+        name: azsdk-pool-mms-ubuntu-2004-general
+        image: azsdk-pool-mms-ubuntu-2004-1espt
+        os: linux
+
+      steps:
+      - template: /eng/pipelines/templates/steps/targeting-string-resolve.yml@self
+        parameters:
+          BuildTargetingString: ${{ parameters.BuildTargetingString }}
+
+      - template: ../steps/build-package-artifacts.yml@self
+        parameters:
+          ServiceDirectory: ${{ parameters.ServiceDirectory }}
+          BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
+          TestPipeline: ${{ parameters.TestPipeline }}
+          Artifacts: ${{ parameters.Artifacts }}
+          ArtifactSuffix: linux
+
+    - job: 'Build_Windows'
+      timeoutInMinutes: 90
 
       pool:
-        name: $(poolName)
-        vmImage: $(imageName)
-        os: $(os)
+        name: azsdk-pool-mms-win-2022-1espt
+        image: azsdk-pool-mms-win-2022-1es-pt
+        os: windows
 
       steps:
       - template: /eng/pipelines/templates/steps/targeting-string-resolve.yml@self
@@ -126,17 +129,41 @@ jobs:
           BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
           TestPipeline: ${{ parameters.TestPipeline }}
           Artifacts: ${{ parameters.Artifacts }}
-          ArtifactSuffix: $(ArtifactName)
+          ArtifactSuffix: windows
+
+    - job: 'Build_MacOS'
+      timeoutInMinutes: 90
+
+      pool:
+        name: 'Azure Pipelines'
+        vmImage: macos-11
+        os: macOS
+
+      steps:
+      - template: /eng/pipelines/templates/steps/targeting-string-resolve.yml@self
+        parameters:
+          BuildTargetingString: ${{ parameters.BuildTargetingString }}
+
+      - template: ../steps/build-package-artifacts.yml@self
+        parameters:
+          ServiceDirectory: ${{ parameters.ServiceDirectory }}
+          BeforePublishSteps: ${{ parameters.BeforePublishSteps }}
+          TestPipeline: ${{ parameters.TestPipeline }}
+          Artifacts: ${{ parameters.Artifacts }}
+          ArtifactSuffix: macos
 
     - job: 'CoalesceBuildArtifacts'
       displayName: Combine Built Artifacts
       dependsOn:
-        - 'Build'
+        - 'Build_Linux'
+        - 'Build_Windows'
+        - 'Build_MacOS'
       timeoutInMinutes: 90
 
       pool:
         name: azsdk-pool-mms-ubuntu-2004-general
-        vmImage: MMSUbuntu20.04
+        image: azsdk-pool-mms-ubuntu-2004-1espt
+        os: linux
 
       steps:
       - task: DownloadPipelineArtifact@2
@@ -162,9 +189,11 @@ jobs:
   - job: 'Build_Extended'
     displayName: Build Extended
     dependsOn:
-      - 'Build'
+      - ${{ if ne(parameters['AdvancedBuild'], true) }}:
+        - 'Build'
       - ${{ if eq(parameters['AdvancedBuild'], true) }}:
         - 'CoalesceBuildArtifacts'
+      
     timeoutInMinutes: 90
 
     pool:

eng/pipelines/templates/stages/regression-job-matrix.json

@@ -3,7 +3,7 @@
     "Agent": {
       "ubuntu-20.04": {
         "OSVmImage": "azsdk-pool-mms-ubuntu-2004-1espt",
-        "Pool": "azsdk-pool-mms-ubuntu-2004-1es-pt",
+        "Pool": "env:LINUXPOOL",
         "os": "linux"
       }
     },