Skip to content

Commit 1a22ddb

Browse files
vinitsuri-msftvinitsuri-msft
committed
removed comparison and fixed link
1 parent 1f12be2 commit 1a22ddb

File tree

3 files changed

+30
-135
lines changed

3 files changed

+30
-135
lines changed

‎Tasks/QuickPerfTest/Invoke-QuickPerfTest.ps1‎

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ function GetTestRuns($headers)
9696
return $runs
9797
}
9898

99+
function GetTestRunUri($testRunId)
100+
{
101+
$uri = [String]::Format("{0}/_apis/clt/testruns/{1}?api-version=1.0", $CltAccountUrl,$testRunId)
102+
$run = Invoke-RestMethod -ContentType "application/json" -UserAgent $userAgent -TimeoutSec $global:RestTimeout -Uri $uri -Headers $headers
103+
104+
return $run.WebResultUrl
105+
}
106+
99107
function RunInProgress($run)
100108
{
101109
return $run.state -eq "queued" -or $run.state -eq "inProgress"
@@ -209,24 +217,11 @@ function UploadSummaryMdReport($summaryMdPath)
209217

210218
if (($env:SYSTEM_HOSTTYPE -eq "build") -and (Test-Path($summaryMdPath)))
211219
{
220+
Write-Output "This is a build task and hence summary is being uploaded"
212221
Write-Host "##vso[task.addattachment type=Distributedtask.Core.Summary;name=Load test results;]$summaryMdPath"
213222
}
214223
}
215224

216-
function GetLastSuccessfulBuild($headers)
217-
{
218-
$uri = ("{0}/{1}/_apis/build/builds?api-version={2}&definitions={3}&statusFilter=completed&resultFilter=succeeded&`$top=1" -f $TFSAccountUrl, $env:System_TeamProjectId, '2.0', $env:SYSTEM_DEFINITIONID)
219-
$previousBuild = Invoke-RestMethod -ContentType "application/json" -UserAgent $userAgent -Uri $uri -Headers $headers
220-
return $previousBuild.Value
221-
}
222-
223-
function GetFilteredTestRuns($headers, $filter)
224-
{
225-
$uri = ("{0}/_apis/clt/testruns?api-version=1.0&detailed=false&{1}" -f $CltAccountUrl, $filter)
226-
$filteredTestRuns = Invoke-RestMethod -ContentType "application/json" -UserAgent $userAgent -Uri $uri -Headers $headers
227-
return $filteredTestRuns
228-
}
229-
230225
############################################## PS Script execution starts here ##########################################
231226
Write-Output "Starting Quick Perf Test Script"
232227

@@ -267,46 +262,22 @@ if ($drop.dropType -eq "InPlaceDrop")
267262

268263
$run = QueueTestRun $headers $runJson
269264
MonitorTestRun $headers $run
270-
265+
$webResultsUrl = GetTestRunUri($run.id)
266+
271267
Write-Output ("Run-id for this load test is {0} and its name is '{1}'." -f $run.runNumber, $run.name)
272-
Write-Output ("To view run details navigate to {0}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={1}" -f $TFSAccountUrl, $run.id)
268+
Write-Output ("To view run details navigate to {0}" -f $webResultsUrl)
273269
Write-Output "To view detailed results navigate to Load Test | Load Test Manager in Visual Studio IDE, and open this run."
274270

275271
$resultsMDFolder = New-Item -ItemType Directory -Force -Path "$env:Temp\LoadTestResultSummary"
272+
276273
$resultFilePattern = ("QuickPerfTestResults_{0}_{1}_*.md" -f $env:AGENT_ID, $env:SYSTEM_DEFINITIONID)
277-
$excludeFilePattern = ("QuickPerfTestResults_{0}_{1}_{2}_*.md" -f $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID)
278-
Remove-Item $resultsMDFolder\$resultFilePattern -Exclude $excludeFilePattern -Force
279-
$summaryFile = ("{0}\QuickPerfTestResults_{1}_{2}_{3}_{4}.md" -f $resultsMDFolder, $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID, $run.id)
280274

281-
$summary = ('[Test Run: {0}]({2}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={3}) using {1}.<br/>' -f $run.runNumber, $run.name, $TFSAccountUrl, $run.id)
282-
283-
$runComparisonAvailable = $false
284-
$lastSuccessfulBuild = GetLastSuccessfulBuild $headers
275+
$excludeFilePattern = ("QuickPerfTestResults_{0}_{1}_{2}_*.md" -f $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID)
276+
Remove-Item $resultsMDFolder\$resultFilePattern -Exclude $excludeFilePattern -Force
277+
$summaryFile = ("{0}\QuickPerfTestResults_{1}_{2}_{3}_{4}.md" -f $resultsMDFolder, $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID, $run.id)
285278

286-
if ($lastSuccessfulBuild)
287-
{
288-
$runSourceIdentifierFilter=('runsourceidentifier=build/{0}/{1}' -f $env:SYSTEM_DEFINITIONID, $lastSuccessfulBuild.id)
289-
$runsInLastBuild = GetFilteredTestRuns $headers $runSourceIdentifierFilter
290-
291-
if ($runsInLastBuild)
292-
{
293-
foreach ($previousRun in $runsInLastBuild)
294-
{
295-
if ($previousRun.name -eq $run.name)
296-
{
297-
$runComparisonAvailable = $true
298-
$summary += ('[Compare with run {0}]({1}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=compare&runId1={2}&runId2={3}) from [build {4}]({1}/{5}/_build#buildId={4}&_a=summary).' -f $previousRun.runNumber, $global:TFSAccountUrl, $previousRun.id, $run.id, $lastSuccessfulBuild.id, $env:System_TeamProjectId, $env:BUILD_BUILDID)
299-
break
300-
}
301-
}
302-
}
303-
}
279+
$summary = ('[Test Run: {0}]({1}) using {2}.<br/>' -f $run.runNumber, $webResultsUrl ,$run.name)
304280

305-
if(!$runComparisonAvailable)
306-
{
307-
$summary += ('No previous run found for comparison.')
308-
}
309-
310281
('<p>{0}</p>' -f $summary) >> $summaryFile
311282
UploadSummaryMdReport $summaryFile
312283
}

‎Tasks/RunJMeterLoadTest/Start-ApacheJMeterTest.ps1‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,6 @@ function UploadSummaryMdReport($summaryMdPath)
276276
}
277277
}
278278

279-
function GetLastSuccessfulBuild($headers)
280-
{
281-
$uri = ("{0}/{1}/_apis/build/builds?api-version={2}&definitions={3}&statusFilter=completed&resultFilter=succeeded&`$top=1" -f $global:TFSAccountUrl, $env:System_TeamProjectId, '2.0', $env:SYSTEM_DEFINITIONID)
282-
$previousBuild = Get $headers $uri
283-
return $previousBuild.Value
284-
}
285-
286-
function GetFilteredTestRuns($headers, $filter)
287-
{
288-
$uri = ("{0}/_apis/clt/testruns?{1}&detailed=false&runType=JMeterLoadTest&{2}" -f $global:ElsAccountUrl, $apiVersion, $filter)
289-
$filteredTestRuns = Get $headers $uri
290-
return $filteredTestRuns
291-
}
292-
293-
294279
############################################## PS Script execution starts here ##########################################
295280
WriteTaskMessages "Starting Load Test Script"
296281

@@ -353,44 +338,20 @@ if ($drop.dropType -eq "TestServiceBlobDrop")
353338
WriteTaskMessages "The load test completed successfully."
354339
}
355340

341+
$run = GetTestRun $headers $run.id
342+
$webResultsUrl = $run.WebResultUrl
343+
Write-Output ("{0}", $webResultsUrl)
356344
Write-Output ("Run-id for this load test is {0} and its name is '{1}'." -f $run.runNumber, $run.name)
357-
Write-Output ("To view run details navigate to {0}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={1}" -f $global:TFSAccountUrl, $run.id)
345+
Write-Output ("To view run details navigate to {0}" -f $webResultsUrl)
358346

359347
$resultsMDFolder = New-Item -ItemType Directory -Force -Path "$env:Temp\LoadTestResultSummary"
360348
$resultFilePattern = ("ApacheJMeterTestResults_{0}_{1}_*.md" -f $env:AGENT_ID, $env:SYSTEM_DEFINITIONID)
361349
$excludeFilePattern = ("ApacheJMeterTestResults_{0}_{1}_{2}_*.md" -f $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID)
362350
Remove-Item $resultsMDFolder\$resultFilePattern -Exclude $excludeFilePattern -Force
363351
$summaryFile = ("{0}\ApacheJMeterTestResults_{1}_{2}_{3}_{4}.md" -f $resultsMDFolder, $env:AGENT_ID, $env:SYSTEM_DEFINITIONID, $env:BUILD_BUILDID, $run.id)
364352

365-
$summary = ('[Test Run: {0}]({2}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={3}) using {1}.<br/>' -f $run.runNumber, $run.name, $global:TFSAccountUrl, $run.id)
366-
367-
$runComparisonAvailable = $false
368-
$lastSuccessfulBuild = GetLastSuccessfulBuild $headers
369-
370-
if ($lastSuccessfulBuild)
371-
{
372-
$runSourceIdentifierFilter=('runsourceidentifier=build/{0}/{1}' -f $env:SYSTEM_DEFINITIONID, $lastSuccessfulBuild.id)
373-
$runsInLastBuild = GetFilteredTestRuns $headers $runSourceIdentifierFilter
374-
375-
if ($runsInLastBuild)
376-
{
377-
foreach ($previousRun in $runsInLastBuild)
378-
{
379-
if ($previousRun.name -eq $run.name)
380-
{
381-
$runComparisonAvailable = $true
382-
$summary += ('[Compare with run {0}]({1}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=compare&runId1={2}&runId2={3}) from [build {4}]({1}/{5}/_build#buildId={4}&_a=summary).' -f $previousRun.runNumber, $global:TFSAccountUrl, $previousRun.id, $run.id, $lastSuccessfulBuild.id, $env:System_TeamProjectId, $env:BUILD_BUILDID)
383-
break
384-
}
385-
}
386-
}
387-
}
388-
389-
if(!$runComparisonAvailable)
390-
{
391-
$summary += ('No previous run found for comparison.')
392-
}
393-
353+
$summary = ('[Test Run: {0}]({1}) using {2}.<br/>' -f $run.runNumber, $webResultsUrl , $run.name)
354+
394355
('<p>{0}</p>' -f $summary) >> $summaryFile
395356
UploadSummaryMdReport $summaryFile
396357
}

‎Tasks/RunLoadTest/Start-CloudLoadTest.ps1‎

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -349,20 +349,6 @@ function UploadSummaryMdReport($summaryMdPath)
349349
}
350350
}
351351

352-
function GetLastSuccessfulBuild($headers)
353-
{
354-
$uri = ("{0}/{1}/_apis/build/builds?api-version={2}&definitions={3}&statusFilter=completed&resultFilter=succeeded&`$top=1" -f $global:TFSAccountUrl, $env:System_TeamProjectId, '2.0', $env:SYSTEM_DEFINITIONID)
355-
$previousBuild = Get $headers $uri
356-
return $previousBuild.Value
357-
}
358-
359-
function GetFilteredTestRuns($headers, $filter)
360-
{
361-
$uri = ("{0}/_apis/clt/testruns?{1}&detailed=false&{2}" -f $global:ElsAccountUrl, $apiVersion, $filter)
362-
$filteredTestRuns = Get $headers $uri
363-
return $filteredTestRuns
364-
}
365-
366352
############################################## PS Script execution starts here ##########################################
367353
WriteTaskMessages "Starting Load Test Script"
368354

@@ -437,8 +423,11 @@ if ($drop.dropType -eq "TestServiceBlobDrop")
437423
WriteTaskMessages "The load test completed successfully."
438424
}
439425

440-
Write-Output ("Run-id for this load test is {0} and its name is '{1}'." -f $run.runNumber, $run.name)
441-
Write-Output ("To view run details navigate to {0}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={1}" -f $global:TFSAccountUrl, $run.id)
426+
$run = GetTestRun $headers $run.id
427+
$webResultsUri = $run.WebResultUrl
428+
429+
Write-Output ("Run-id for this load test is {0} and its name is '{1}'." -f $run.runNumber, $run.name)
430+
Write-Output ("To view run details navigate to {0}" -f $webResultsUri)
442431
Write-Output "To view detailed results navigate to Load Test | Load Test Manager in Visual Studio IDE, and open this run."
443432

444433
$resultsMDFolder = New-Item -ItemType Directory -Force -Path "$env:Temp\LoadTestResultSummary"
@@ -468,35 +457,9 @@ if ($drop.dropType -eq "TestServiceBlobDrop")
468457
$thresholdImage="bowtie-status-success"
469458
}
470459

471-
$summary = ('<span class="bowtie-icon {4}" /> {5}<br/>[Test Run: {0}]({2}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=summary&runId={3}) using {1}.<br/>' -f $run.runNumber, $run.name, $global:TFSAccountUrl, $run.id, $thresholdImage, $thresholdMessage)
472-
473-
$runComparisonAvailable = $false
474-
$lastSuccessfulBuild = GetLastSuccessfulBuild $headers
475-
476-
if ($lastSuccessfulBuild)
477-
{
478-
$runSourceIdentifierFilter=('runsourceidentifier=build/{0}/{1}' -f $env:SYSTEM_DEFINITIONID, $lastSuccessfulBuild.id)
479-
$runsInLastBuild = GetFilteredTestRuns $headers $runSourceIdentifierFilter
480-
481-
if ($runsInLastBuild)
482-
{
483-
foreach ($previousRun in $runsInLastBuild)
484-
{
485-
if ($previousRun.name -eq $run.name)
486-
{
487-
$runComparisonAvailable = $true
488-
$summary += ('[Compare with run {0}]({1}/_apps/hub/ms.vss-cloudloadtest-web.hub-loadtest-account?_a=compare&runId1={2}&runId2={3}) from [build {4}]({1}/{5}/_build#buildId={4}&_a=summary).' -f $previousRun.runNumber, $global:TFSAccountUrl, $previousRun.id, $run.id, $lastSuccessfulBuild.id, $env:System_TeamProjectId, $env:BUILD_BUILDID)
489-
break
490-
}
491-
}
492-
}
493-
}
494-
495-
if(!$runComparisonAvailable)
496-
{
497-
$summary += ('No previous run found for comparison.')
498-
}
499460

461+
$summary = ('<span class="bowtie-icon {3}" /> {4}<br/>[Test Run: {0}]({1}) using {2}.<br/>' -f $run.runNumber, $webResultsUri , $run.name, $thresholdImage, $thresholdMessage)
462+
500463
('<p>{0}</p>' -f $summary) >> $summaryFile
501464
UploadSummaryMdReport $summaryFile
502465
}

0 commit comments

Comments
 (0)