Refactor smoke test pipelines (Azure#45824)

Refactored in order to use the new machine pools

Author: weshaggard

common/smoke-tests/smoke-test-dependencies.yml

@@ -1,6 +1,17 @@
+parameters:
+- name: OS
+  type: string
+- name: Pool
+  type: string
+- name: OSVmImage
+  type: string
+
 jobs:
   - template: ./smoke-test-job.yml
     parameters:
+      OS: ${{ parameters.OS }}
+      Pool: ${{ parameters.Pool }}
+      OSVmImage: ${{ parameters.OSVmImage }}
       TestTask:
         task: AzurePowerShell@5
         displayName: 'Run Smoke Test Samples'
@@ -18,36 +29,10 @@ jobs:
           AZURE_LOG_LEVEL: 2
 
       Matrix:
-        Java 8 Windows (AzureCloud):
-          JavaTestVersion: '1.8'
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS Windows (AzureCloud):
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java 8 Linux (AzureCloud):
-          Pool: "azsdk-pool-mms-ubuntu-2004-general"
-          OSVmImage: "MMSUbuntu20.04"
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS Linux (AzureCloud):
-          Pool: "azsdk-pool-mms-ubuntu-2004-general"
-          OSVmImage: "MMSUbuntu20.04"
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java 8 MacOS (AzureCloud):
-          JavaTestVersion: '1.8'
-          Pool: Azure Pipelines
-          OSVmImage: macos-latest
+        Java_${{ parameters.OS }}_(AzureCloud):
+          JavaTestVersion: $(LatestNonLtsJavaVersion)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS MacOS (AzureCloud):
-          JavaTestVersion: '1.11'
-          Pool: Azure Pipelines
-          OSVmImage: macos-latest
+        JavaLTS_${{ parameters.OS }}_(AzureCloud):
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'

common/smoke-tests/smoke-test-job.yml

@@ -1,6 +1,12 @@
 parameters:
   - name: Matrix
     type: object
+  - name: OS
+    type: string
+  - name: Pool
+    type: string
+  - name: OSVmImage
+    type: string
   - name: TestTask
     type: object
   - name: MaxParallel
@@ -11,21 +17,25 @@ parameters:
     default: 90
 
 jobs:
-  - job: SmokeTest
+  - job:
+    displayName: Smoke Tests - ${{ parameters.OS }}
     timeoutInMinutes: ${{ parameters.Timeout }}
 
     strategy:
       maxParallel: ${{ parameters.MaxParallel }}
       matrix: ${{ parameters.Matrix }}
 
     pool:
-      name: $(Pool)
-      vmImage: $(OSVmImage)
+      name: ${{ parameters.Pool }}
+      ${{ if eq(parameters.OS, 'macOs') }}:
+        vmImage: ${{ parameters.OSVmImage }}
+      ${{ else }}:
+        demands: ImageOverride -equals ${{ parameters.OSVmImage }}
 
     steps:
       - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
         parameters:
-          AgentImage: $(OSVmImage)
+          AgentImage: ${{ parameters.OSVmImage }}
 
       - task: Maven@4
         displayName: Use the latest package version from the dev feed
@@ -84,5 +94,5 @@ jobs:
 
       - template: /eng/common/TestResources/remove-test-resources.yml
         parameters:
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
+          ServiceDirectory: $(ServiceDirectory)
           ServiceConnection: azure-sdk-tests-public

common/smoke-tests/smoke-test-samples.yml

@@ -22,8 +22,8 @@ jobs:
 
       Matrix:
         Service Bus:
-          JavaTestVersion: '1.8'
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
+          JavaTestVersion: $(JavaTestVersion)
+          Pool: $(WINDOWSPOOL)
+          OSVmImage: $(WINDOWSVMIMAGE)
           PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/sdk/servicebus/'

common/smoke-tests/smoke-test.yml

@@ -2,12 +2,31 @@ trigger: none
 
 variables:
   - template: /eng/pipelines/templates/variables/globals.yml
+  - template: /eng/pipelines/templates/variables/image.yml
 
 stages:
   - stage: smoke_tests
     displayName: Smoke Tests
+
     jobs:
       - template: ./smoke-test-dependencies.yml
+        parameters:
+          OS: Windows
+          Pool: $(WINDOWSPOOL)
+          OSVmImage: $(WINDOWSVMIMAGE)
+
+      - template: ./smoke-test-dependencies.yml
+        parameters:
+          OS: Linux
+          Pool: $(LINUXPOOL)
+          OSVmImage: $(LINUXVMIMAGE)
+
+      - template: ./smoke-test-dependencies.yml
+        parameters:
+          OS: macOS
+          Pool: $(MACPOOL)
+          OSVmImage: $(MACVMIMAGE)
+
 #  - stage: smoke_tests_samples
 #    displayName: Smoke Test Samples
 #    dependsOn: []