Skip to content

Build HttpStress and SslStress with live-built runtime using current TFM #61689

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.

Sign up for GitHub

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

Merged
antonfirsov merged 20 commits into from
Nov 30, 2021
Merged

Build HttpStress and SslStress with live-built runtime using current TFM #61689

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bfd6dcd
refactor stress test builds
antonfirsov Nov 16, 2021
72c0b81
cleanup container scripts
antonfirsov Nov 16, 2021
3b70584
delete LiveBuildTest
antonfirsov Nov 16, 2021
459611d
cleanup stress projects
antonfirsov Nov 16, 2021
49338ed
remove unnecessarry newlines
antonfirsov Nov 16, 2021
cd243e6
cleanup dockerfiles
antonfirsov Nov 16, 2021
f27e4f0
better way to find reference locations in stress .props
antonfirsov Nov 18, 2021
5e90f14
Dockerfiles: use $VERSION, delete $ARCH
antonfirsov Nov 18, 2021
673b5f6
fix windows.Dockerfile
antonfirsov Nov 18, 2021
0af9f7b
fix Dockerfiles
antonfirsov Nov 18, 2021
5a04963
fix linux.Dockerfile
antonfirsov Nov 18, 2021
361f1e5
fix linux linux.Dockerfile
antonfirsov Nov 19, 2021
f87f45b
disable HTTP/3 to see if the rest succeeds
antonfirsov Nov 22, 2021
11d6325
Merge branch 'live-stress' of https://github.com/antonfirsov/runtime …
antonfirsov Nov 22, 2021
e0a3ef8
rename Build-Local.ps1 and extend README.md
antonfirsov Nov 22, 2021
83b0835
re-enable HTTP3 with timeout
antonfirsov Nov 22, 2021
48a9602
remove trailing whitespace
antonfirsov Nov 22, 2021
280a3df
nits
antonfirsov Nov 26, 2021
ab4072f
improve build-local.sh
antonfirsov Nov 26, 2021
6557474
improve the rest of the scripts
antonfirsov Nov 26, 2021
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
Prev Previous commit
Next Next commit
Dockerfiles: use $VERSION, delete $ARCH
  • Loading branch information
@antonfirsov
antonfirsov committed Nov 18, 2021
commit 5e90f14f2a34be42a3a0b0601682947f5ee64e09
20 changes: 9 additions & 11 deletions eng/docker/libraries-sdk.linux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df2
ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-bullseye-slim

FROM $BUILD_BASE_IMAGE as corefxbuild

ARG CONFIGURATION=Release
ARG VERSION=7.0

WORKDIR /repo
COPY . .

RUN ./build.sh clr+libs -runtimeconfiguration Release -configuration $CONFIGURATION -ci

FROM $SDK_BASE_IMAGE as target

# Install 7.0 SDK:
# Install latest daily SDK:
RUN wget https://dot.net/v1/dotnet-install.sh
RUN bash ./dotnet-install.sh --channel 7.0.1xx --quality daily --install-dir /usr/share/dotnet
RUN bash ./dotnet-install.sh --channel $VERSION.1xx --quality daily --install-dir /usr/share/dotnet

# Collect the following artifacts under /live-runtime-artifacts,
# so projects can build and test against the live-built runtime:
Expand All @@ -22,17 +24,13 @@ RUN bash ./dotnet-install.sh --channel 7.0.1xx --quality daily --install-dir /us
# 3. targetingpacks.targets, so stress test builds can target the live-built runtime instead of the one in the pre-installed SDK
# 4. testhost

ARG VERSION=7.0
ARG ARCH=x64
ARG CONFIGURATION=Release

COPY --from=corefxbuild \
/repo/artifacts/bin/microsoft.netcore.app.ref \
/live-runtime-artifacts/microsoft.netcore.app.ref

COPY --from=corefxbuild \
/repo/artifacts/bin/microsoft.netcore.app.runtime.linux-$ARCH \
/live-runtime-artifacts/microsoft.netcore.app.runtime.linux-$ARCH
/repo/artifacts/bin/microsoft.netcore.app.runtime.linux-x64 \
/live-runtime-artifacts/microsoft.netcore.app.runtime.linux-x64

COPY --from=corefxbuild \
/repo/eng/targetingpacks.targets \
Expand All @@ -43,5 +41,5 @@ COPY --from=corefxbuild \
/live-runtime-artifacts/testhost

# Add AspNetCore bits to testhost:
RUN mkdir -p /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-$ARCH/shared/Microsoft.AspNetCore.App
RUN cp -r /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION* /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-$ARCH/shared/Microsoft.AspNetCore.App
RUN mkdir -p /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App
RUN cp -r /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION* /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App
8 changes: 4 additions & 4 deletions eng/docker/libraries-sdk.windows.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:6.0-nanoserver-1809
FROM $SDK_BASE_IMAGE as target

ARG VERSION=7.0
ARG CONFIGURATION=Release

SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

USER ContainerAdministrator

RUN Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile .\dotnet-install.ps1
RUN & .\dotnet-install.ps1 -Channel 7.0.1xx -Quality daily -InstallDir 'C:/Program Files/dotnet'
RUN & .\dotnet-install.ps1 -Channel $VERSION.1xx -Quality daily -InstallDir 'C:/Program Files/dotnet'

USER ContainerUser

COPY . /live-runtime-artifacts

ARG VERSION=7.0
ARG CONFIGURATION=Release

ENV _ASPNETCORE_SOURCE_DIR="C:/Program Files/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*"
ENV _ASPNETCORE_DEST_DIR="C:/live-runtime-artifacts/testhost/net$VERSION-windows-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App"
RUN & New-Item -ItemType Directory -Path $env:_ASPNETCORE_DEST_DIR
Expand Down