Split test in separate agents

Author: slozier

.vsts-ci.yml

@@ -1,37 +1,105 @@
 jobs:
+  - job: build
+    strategy:
+      matrix:
+        linux:
+          name: 'Linux'
+          imageName: 'ubuntu-22.04'
+        mac:
+          name: 'macOS'
+          imageName: 'macOS-latest'
+        windows:
+          name: 'Windows'
+          imageName: 'windows-latest'
 
-################################################################################
-- job: Windows
-################################################################################
-  displayName: Windows
-  timeoutInMinutes: 180
-  pool:
-    vmImage: windows-latest
-  steps:
-  - template: eng/steps.yml
-    parameters:
-      os: 'Windows'
-
-################################################################################
-- job: Linux
-################################################################################
-  displayName: Linux (Ubuntu)
-  timeoutInMinutes: 180
-  pool:
-    vmImage: ubuntu-22.04
-  steps:
-  - template: eng/steps.yml
-    parameters:
-      os: 'Linux'
-
-################################################################################
-- job: macOS
-################################################################################
-  displayName: macOS
-  timeoutInMinutes: 180
-  pool:
-    vmImage: macOS-latest
-  steps:
-  - template: eng/steps.yml
-    parameters:
-      os: 'macOS'
+    timeoutInMinutes: 180
+    pool:
+      vmImage: $(imageName)
+
+    steps:
+    - template: eng/steps.yml
+      parameters:
+        os: $(name)
+
+  - job: test
+    strategy:
+      matrix:
+        linux_net462:
+          name: Linux
+          imageName: ubuntu-22.04
+          framework: net462
+        linux_net6_0:
+          name: Linux
+          imageName: ubuntu-22.04
+          framework: net6.0
+        linux_net8_0:
+          name: Linux
+          imageName: ubuntu-22.04
+          framework: net8.0
+        macos_net462:
+          name: macOS
+          imageName: macOS-latest
+          framework: net462
+        macos_net6_0:
+          name: macOS
+          imageName: macOS-latest
+          framework: net6.0
+        macos_net8_0:
+          name: macOS
+          imageName: macOS-latest
+          framework: net8.0
+        windows_net462:
+          name: Windows
+          imageName: windows-latest
+          framework: net462
+        windows_net6_0:
+          name: Windows
+          imageName: windows-latest
+          framework: net6.0
+        windows_net8_0:
+          name: Windows
+          imageName: windows-latest
+          framework: net8.0
+
+    condition: false
+    displayName: Test
+    timeoutInMinutes: 180
+    pool:
+      vmImage: $(imageName)
+
+    steps:
+      # Prerequisites
+      - checkout: self
+        submodules: true
+
+      # Setup .NET
+      - task: UseDotNet@2
+        displayName: Install .NET 6.0 runtime for testing
+        inputs:
+          packageType: 'runtime'
+          version: '6.0.x'
+      - task: UseDotNet@2
+        displayName: Install .NET 8.0 runtime for testing
+        inputs:
+          packageType: 'runtime'
+          version: '8.0.x'
+      - task: UseDotNet@2
+        displayName: Install .NET 9.0 SDK for build
+        inputs:
+          packageType: 'sdk'
+          version: '9.0.x'
+
+      # Build & Test
+      - powershell: ./make.ps1
+        displayName: Build
+      - powershell: ./make.ps1 -frameworks $(framework) test-all
+        displayName: Test ($(framework))
+
+      - task: PublishTestResults@2
+        displayName: Publish Test Results
+        inputs:
+          testRunner: VSTest
+          testResultsFiles: '**/*.trx'
+          mergeTestResults: true
+          testRunTitle: $(name) - $(framework)
+        condition: succeededOrFailed()

eng/steps.yml

@@ -6,6 +6,7 @@ steps:
     submodules: true
 
   - powershell: |
+     Write-Host "${{ parameters.os }}"
 
      $xml = [xml] (Get-Content CurrentVersion.props)
      $major = $xml.Project.PropertyGroup.MajorVersion
@@ -43,27 +44,27 @@ steps:
       version: '9.0.x'
 
   # Set Mono version on macOS
-  - ${{ if eq(parameters.os, 'macOS') }}:
-    - task: Bash@3
-      displayName: Set Mono Version
-      inputs:
-        targetType: inline
-        script: |
-          # use Mono 6.4.0 version
-          SYMLINK=6.4.0
-          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
-          echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
-          echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
-          echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+  - task: Bash@3
+    displayName: Set Mono Version
+    inputs:
+      targetType: inline
+      script: |
+        # use Mono 6.4.0 version
+        SYMLINK=6.4.0
+        MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+        echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
+        echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+        echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+    condition:  eq(parameters.os, 'macOS')
 
   # Install mono when running on Linux
-  - ${{ if eq(parameters.os, 'Linux') }}:
-    - task: Bash@3
-      displayName: Install tools
-      inputs:
-        targetType: inline
-        script: |
-          sudo apt-get -yq install mono-vbnc dos2unix
+  - task: Bash@3
+    displayName: Install tools
+    inputs:
+      targetType: inline
+      script: |
+        sudo apt-get -yq install mono-vbnc dos2unix
+    condition:  eq(parameters.os, 'Linux')
 
   # Dump version info
   - task: PowerShell@2
@@ -78,18 +79,6 @@ steps:
   - powershell: ./make.ps1
     displayName: Build
 
-  - powershell: ./make.ps1 test-all
-    displayName: Test
-
-  - task: PublishTestResults@2
-    displayName: Publish Test Results
-    inputs:
-      testRunner: VSTest
-      testResultsFiles: '**/*.trx'
-      mergeTestResults: true
-      testRunTitle: ${{ parameters.os }}
-    condition: succeededOrFailed()
-
   - powershell: ./make.ps1 package
     displayName: Package
     condition: succeededOrFailed()