Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use windows.vs2022.amd64.open for stress tests #82736

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions eng/docker/build-docker-sdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if ($buildWindowsContainers)
exit $LASTEXITCODE
}

$dockerFileName="libraries-sdk.windows.Dockerfile"
$dockerFile="$dockerFilePrefix.windows.Dockerfile"

# Collect the following artifacts to folder, that will be used as build context for the container,
Expand All @@ -49,8 +50,10 @@ if ($buildWindowsContainers)
-Destination $dockerContext\microsoft.netcore.app.runtime.win-x64
Copy-Item -Recurse -Path $binArtifacts\testhost `
-Destination $dockerContext\testhost
Copy-Item -Recurse -Path $REPO_ROOT_DIR\eng\targetingpacks.targets `
Copy-Item -Path $REPO_ROOT_DIR\eng\targetingpacks.targets `
-Destination $dockerContext\targetingpacks.targets
Copy-Item -Path $dockerFile `
-Destination $dockerContext\$dockerFileName

# In case of non-CI builds, testhost may already contain Microsoft.AspNetCore.App (see build-local.ps1 in HttpStress):
$testHostAspNetCorePath="$dockerContext\testhost\net$dotNetVersion-windows-$configuration-x64/shared/Microsoft.AspNetCore.App"
Expand All @@ -60,7 +63,7 @@ if ($buildWindowsContainers)

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--file $dockerFile `
--file $dockerContext\$dockerFileName `
$dockerContext
}
else
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/stress/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extends:
DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
demands: ImageOverride -equals windows.vs2022.amd64.open

steps:
- checkout: self
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/stress/ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extends:
timeoutInMinutes: 120
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
demands: ImageOverride -equals windows.vs2022.amd64.open

steps:
- checkout: self
Expand Down