Skip to content

Commit 54ba56f

Browse files
authored
[release/9.0-staging] [HttpStress] Fix Linux HttpStress build (#113617)
Backport of #111664 to release/9.0-staging Fixes #111660.
1 parent 4d66ebb commit 54ba56f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

eng/pipelines/libraries/stress/http.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extends:
3737
DUMPS_SHARE_MOUNT_ROOT: "/dumps-share"
3838
pool:
3939
name: $(DncEngPublicBuildPool)
40-
demands: ImageOverride -equals 1es-ubuntu-1804-open
40+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
4141

4242
steps:
4343
- checkout: self

src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RUN apt-get update -y && \
1010
RUN git clone --depth 1 --single-branch --branch v2.3.5 --recursive https://github.com/microsoft/msquic
1111
RUN cd msquic/ && \
1212
mkdir build && \
13-
cmake -B build -DCMAKE_BUILD_TYPE=Debug -DQUIC_ENABLE_LOGGING=false -DQUIC_USE_SYSTEM_LIBCRYPTO=true -DQUIC_BUILD_TOOLS=off -DQUIC_BUILD_TEST=off -DQUIC_BUILD_PERF=off -DQUIC_TLS=openssl3 -DQUIC_ENABLE_SANITIZERS=on && \
13+
cmake -B build -DCMAKE_BUILD_TYPE=Debug -DQUIC_ENABLE_LOGGING=false -DQUIC_USE_SYSTEM_LIBCRYPTO=true -DQUIC_BUILD_TOOLS=off -DQUIC_BUILD_TEST=off -DQUIC_BUILD_PERF=off -DQUIC_TLS=openssl3 && \
14+
# -DQUIC_ENABLE_SANITIZERS=on && \
1415
cd build && \
1516
cmake --build . --config Debug
1617
RUN cd msquic/build/bin/Debug && \
@@ -41,8 +42,8 @@ ENV DOTNET_DbgMiniDumpName="/dumps-share/coredump.%p"
4142
EXPOSE 5001
4243

4344
# configure adress sanitizer
44-
ENV ASAN_OPTIONS='detect_leaks=0'
45-
ENV LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/12/libasan.so
45+
# ENV ASAN_OPTIONS='detect_leaks=0'
46+
# ENV LD_PRELOAD=/usr/lib/gcc/x86_64-linux-gnu/12/libasan.so
4647

4748
ENV VERSION=$VERSION
4849
ENV CONFIGURATION=$CONFIGURATION

src/libraries/System.Net.Http/tests/StressTests/HttpStress/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3' # Although the version attribute is obsolete and should be ignored, it's seemingly not the case on Build.Ubuntu.2204.Amd64.Open
22
services:
33
client:
44
build:

0 commit comments

Comments
 (0)