Skip to content

Commit 6ab084f

Browse files
ksumitSumit Kumarnavin22
authored
Fixes typed-rest-client/HttpClient missing from ContainerStuctureTest task #14247 (#15482)
Uses new syntax for container-structure-test tool output formatting Co-authored-by: Sumit Kumar <[email protected]> Co-authored-by: Navin <[email protected]>
1 parent 9a99462 commit 6ab084f

File tree

3 files changed

+10
-45
lines changed

3 files changed

+10
-45
lines changed

Tasks/ContainerStructureTestV0/package-lock.json

Lines changed: 7 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/ContainerStructureTestV0/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"@types/q": "^1.0.7",
2222
"azure-pipelines-task-lib": "2.8.0",
2323
"azure-pipelines-tasks-docker-common-v2": "1.0.0",
24+
"typed-rest-client": "1.5.0",
2425
"utility-common": "file:../../_build/Tasks/Common/utility-common-1.0.2.tgz",
2526
"utility-common-v2": "file:../../_build/Tasks/Common/utility-common-v2-2.0.0.tgz",
2627
"uuid": "^3.0.1"

Tasks/ContainerStructureTestV0/testrunner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class TestRunner {
6969
}
7070

7171
private runContainerStructureTest(runnerPath: string, testFilePath: string, image: string): string {
72-
var tool:tr.ToolRunner = tl.tool(runnerPath).arg(["test", "--image", image, "--config", testFilePath, "--json"]);
72+
var tool:tr.ToolRunner = tl.tool(runnerPath).arg(["test", "--image", image, "--config", testFilePath, "--output", "json"]);
7373
let output = undefined;
7474

7575
try {
@@ -100,4 +100,4 @@ export class TestRunner {
100100
private readonly imageName: string;
101101
private readonly osType = tl.osType().toLowerCase();
102102
private readonly toolName = "container-structure-test";
103-
}
103+
}

0 commit comments

Comments
 (0)