Skip to content

Commit 84ec6ab

Browse files
github-actions[bot]rzikmantonfirsov
authored
[release/9.0] Run stress pipelines on release/9.0 (#107356)
* Run stress pipelines on release/9.0 * Fix Windows HttpStress runs on pipelines (#107178) * Use docker compose workaround from SslStress in HttpStress * Attempt 2 * Attempt 3 --------- Co-authored-by: Anton Firszov <[email protected]> --------- Co-authored-by: Radek Zikmund <[email protected]> Co-authored-by: Radek Zikmund <[email protected]> Co-authored-by: Anton Firszov <[email protected]>
1 parent 058be4f commit 84ec6ab

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

Diff for: eng/pipelines/libraries/stress/http.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ schedules:
1212
include:
1313
- main
1414
- release/8.0
15+
- release/9.0
1516

1617
variables:
1718
- template: ../variables.yml
@@ -99,7 +100,10 @@ extends:
99100
displayName: Docker NanoServer
100101
timeoutInMinutes: 150
101102
variables:
102-
DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
103+
# This will get assigned to the DUMPS_SHARE_MOUNT_ROOT environment
104+
# variable in the stress test script. We need to keep the
105+
# DUMPS_SHARE_MOUNT_ROOT variable empty during the build step.
106+
DUMPS_SHARE_MOUNT_ROOT_PATH: "C:/dumps-share"
103107

104108
# The 1es-windows-2022-open image has an issue where the Chocolatey-installed V1 docker-compose takes precendence over the
105109
# V2 docker-compose required by the stress tests, see: https://github.com/actions/runner-images/issues/7080
@@ -140,6 +144,7 @@ extends:
140144
141145
- powershell: |
142146
cd '$(httpStressProject)'
147+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
143148
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/3.0"
144149
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/3.0"
145150
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -152,6 +157,7 @@ extends:
152157
153158
- powershell: |
154159
cd '$(httpStressProject)'
160+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
155161
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/2.0"
156162
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/2.0"
157163
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -164,6 +170,7 @@ extends:
164170
165171
- powershell: |
166172
cd '$(httpStressProject)'
173+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
167174
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/1.1"
168175
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/1.1"
169176
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory

Diff for: eng/pipelines/libraries/stress/ssl.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ schedules:
1212
include:
1313
- main
1414
- release/8.0
15+
- release/9.0
1516

1617
variables:
1718
- template: ../variables.yml

Diff for: src/libraries/System.Net.Http/tests/StressTests/HttpStress/run-docker-compose.ps1

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ Param(
1616
$REPO_ROOT_DIR = $(git -C "$PSScriptRoot" rev-parse --show-toplevel)
1717
$COMPOSE_FILE = "$PSScriptRoot/docker-compose.yml"
1818

19+
# This is a workaround for an issue with 1es-windows-2022-open, which should be eventually removed.
20+
# See comments in <repo>/eng/pipelines/libraries/stress/ssl.yml for more info.
21+
$dockerComposeCmd = $env:DOCKER_COMPOSE_CMD
22+
if (!(Test-Path $dockerComposeCmd))
23+
{
24+
$dockerComposeCmd = "docker-compose"
25+
}
26+
1927
# Build runtime libraries and place in a docker image
2028

2129
if ($buildCurrentLibraries)
@@ -60,7 +68,7 @@ if ($useWindowsContainers)
6068
$originalErrorPreference = $ErrorActionPreference
6169
$ErrorActionPreference = 'Continue'
6270
try {
63-
docker-compose --log-level DEBUG --file "$COMPOSE_FILE" build $BUILD_ARGS.Split() 2>&1 | ForEach-Object { "$_" }
71+
& $dockerComposeCmd --log-level DEBUG --file "$COMPOSE_FILE" build $BUILD_ARGS.Split() 2>&1 | ForEach-Object { "$_" }
6472
if ($LASTEXITCODE -ne 0) {
6573
throw "docker-compose exited with error code $LASTEXITCODE"
6674
}
@@ -89,5 +97,5 @@ if (!$buildOnly)
8997

9098
$env:HTTPSTRESS_CLIENT_ARGS = $clientStressArgs
9199
$env:HTTPSTRESS_SERVER_ARGS = $serverStressArgs
92-
docker-compose --file "$COMPOSE_FILE" up --abort-on-container-exit
100+
& $dockerComposeCmd --file "$COMPOSE_FILE" up --abort-on-container-exit
93101
}

0 commit comments

Comments
 (0)