shuffle config/platform again. make test content package

microsoft · May 7, 2021 · 99d0f1c · 99d0f1c
1 parent 1065a4c
commit 99d0f1c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/build/Helix/PrepareHelixPayload.ps1 b/build/Helix/PrepareHelixPayload.ps1
@@ -24,6 +24,7 @@ Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Plat
 New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\Microsoft.Internal.Windows.Terminal.TestContent\content\*" "$payloadDir\content\"
 
 function Copy-If-Exists
 {

diff --git a/build/Helix/packages.config b/build/Helix/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="Microsoft.Internal.Windows.Terminal.TestContent" version="1.0.0" />
   <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
   <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
   <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />

diff --git a/build/pipelines/templates/build-console-pgo.yml b/build/pipelines/templates/build-console-pgo.yml
@@ -28,8 +28,8 @@ jobs:
     condition: succeeded()
     testSuite: 'PgoInstrumentationSuite'
     taefQuery: '@IsPgo=true'
-    buildConfiguration: ${{parameters.configuration}}
-    buildPlatform: ${{parameters.platform}}
+    configuration: ${{ parameters.configuration }}
+    platform: ${{ parameters.platform }}
     rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
 
 - template: helix-processtestresults-job.yml

diff --git a/build/pipelines/templates/helix-runtests-job.yml b/build/pipelines/templates/helix-runtests-job.yml
@@ -10,12 +10,16 @@ parameters:
   maxParallel: 4
   rerunPassesRequiredToAvoidFailure: 5
   taefQuery: ''
+  configuration: ''
+  platform: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  buildPlatform: ''
-  buildConfiguration: ''
-  openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
+  matrix:
+    DoTheThing:
+      buildPlatform: '${{ parameters.platform }}'
+      buildConfiguration: '${{ parameters.configuration }}'
+      openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+      closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -26,6 +30,7 @@ jobs:
   timeoutInMinutes: 120
   strategy:
     maxParallel: ${{ parameters.maxParallel }}
+    matrix: ${{ parameters.matrix }}
   variables:
     artifactsDir: $(Build.SourcesDirectory)\Artifacts
     taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\build\Binaries\$(buildPlatform)