adjust helix run and script

microsoft · May 7, 2021 · 650ae2f · 650ae2f
1 parent 34dad1f
commit 650ae2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/build/Helix/ProcessHelixFiles.ps1 b/build/Helix/ProcessHelixFiles.ps1
@@ -51,19 +51,21 @@ $webClient = New-Object System.Net.WebClient
 
 foreach ($testRun in $testRuns.value)
 {
+    Write-Host "testRunUri = $testRun.url"
     $testResults = Invoke-RestMethod -Uri "$($testRun.url)/results?api-version=5.0" -Method Get -Headers $azureDevOpsRestApiHeaders
     $isTestRunNameShown = $false
 
     foreach ($testResult in $testResults.value)
     {
-        if ("comment" -in $testResult)
-        {
+
             $info = ConvertFrom-Json $testResult.comment
             $helixJobId = $info.HelixJobId
             $helixWorkItemName = $info.HelixWorkItemName
 
             $workItem = "$helixJobId-$helixWorkItemName"
 
+            Write-Host "Helix Work Item = $workItem"
+
             if (-not $workItems.Contains($workItem))
             {
                 $workItems.Add($workItem)
@@ -89,9 +91,9 @@ foreach ($testRun in $testRuns.value)
 
                     foreach($pgcFile in $pgcFiles)
                     {
-                        $flavorPath = $pgcFile.Name.Split('.')[0]
-                        $archPath = $pgcFile.Name.Split('.')[1]
-                        $fileName = $pgcFile.Name.Remove(0, $flavorPath.length + $archPath.length + 2)
+                        $flavorPath = $testResult.automatedTestName.Split('.')[0]
+                        $archPath = $testResult.automatedTestName.Split('.')[1]
+                        $fileName = $pgcFile.Name
                         $fullPath = "$OutputFolder\PGO\$flavorPath\$archPath"
                         $destination = "$fullPath\$fileName"
 
@@ -107,6 +109,6 @@ foreach ($testRun in $testRuns.value)
                     }
                 }
             }
-        }
+
     }
 }
diff --git a/build/pipelines/templates/helix-runtests-job.yml b/build/pipelines/templates/helix-runtests-job.yml
@@ -12,17 +12,8 @@ parameters:
   taefQuery: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  matrix:
-    # Release_x86:
-    #   buildPlatform: 'x86'
-    #   buildConfiguration: 'release'
-    #   openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-    #   closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
-    Release_x64:
-      buildPlatform: 'x64'
-      buildConfiguration: 'release'
-      openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-      closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
+  openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}