Skip to content

Commit 2c49787

Browse files
Update common Docker engineering infrastructure with latest (dotnet#218)
* Update common Docker engineering infrastructure with latest * Update run-tests.ps1 with IsLocalRun parameter rename
1 parent 5455fd5 commit 2c49787

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

eng/common/templates/steps/test-images-linux-client.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ steps:
1616
optionalTestArgs="-DisableHttpVerification"
1717
fi
1818
if [ "${{ eq(variables['System.TeamProject'], 'public') }}" == "False" ]; then
19-
optionalTestArgs="$optionalTestArgs -Registry $(acr.server) -RepoPrefix $(stagingRepoPrefix) -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
20-
else
21-
optionalTestArgs="$optionalTestArgs -IsLocalRun"
19+
optionalTestArgs="$optionalTestArgs -PullImages -Registry $(acr.server) -RepoPrefix $(stagingRepoPrefix) -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
2220
fi
2321
echo "##vso[task.setvariable variable=optionalTestArgs]$optionalTestArgs"
2422
displayName: Set Test Variables

eng/common/templates/steps/test-images-windows-client.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ steps:
77
displayName: Docker login
88
- powershell: |
99
if ("${{ eq(variables['System.TeamProject'], 'public') }}" -eq "False") {
10-
$optionalTestArgs="-Registry $env:ACR_SERVER -RepoPrefix $env:STAGINGREPOPREFIX -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
11-
} else {
12-
$optionalTestArgs="-IsLocalRun"
13-
}
10+
$optionalTestArgs="$optionalTestArgs -PullImages -Registry $env:ACR_SERVER -RepoPrefix $env:STAGINGREPOPREFIX -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
11+
}
1412
if ($env:REPOTESTARGS) {
1513
$optionalTestArgs += " $env:REPOTESTARGS"
1614
}

tests/run-tests.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
[string]$Registry,
1313
[string]$RepoPrefix,
1414
[switch]$DisableHttpVerification,
15-
[switch]$IsLocalRun,
15+
[switch]$PullImages,
1616
[string]$ImageInfoPath
1717
)
1818

0 commit comments

Comments
 (0)