Skip to content

Commit

Permalink
Update NCL stress infra for live-live builds (dotnet#896)
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriktsarpalis committed Dec 17, 2019
1 parent 1e38424 commit 35fe82c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

**/*_i.c
**/*_p.c
**/*_i.h
**/*.ilk
**/*.meta
**/*.obj
Expand Down
5 changes: 4 additions & 1 deletion eng/docker/build-docker-sdk.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ Param(
[switch][Alias('w')]$buildWindowsContainers
)

$ErrorActionPreference = "Stop"

$REPO_ROOT_DIR=$(git -C "$PSScriptRoot" rev-parse --show-toplevel)

if ($buildWindowsContainers)
{
# Due to size concerns, we don't currently do docker builds on windows.
# Build on the host machine, then simply copy artifacts to the target docker image.
# This should result in significantly lower build times, for now.
& "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration
& "$REPO_ROOT_DIR/coreclr.cmd" -c Release
& "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration /p:CoreCLRConfiguration=Release

# Dockerize the build artifacts
docker build --tag $imageName `
Expand Down
4 changes: 2 additions & 2 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ WORKDIR /repo
COPY . .

ARG CONFIGURATION=Release
ARG BUILD_SCRIPT_NAME=libraries
RUN ./libraries.sh -c $CONFIGURATION
RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \
./libraries.sh -c $CONFIGURATION /p:CoreCLRConfiguration=Release

FROM $SDK_BASE_IMAGE as target

Expand Down
9 changes: 5 additions & 4 deletions eng/pipelines/libraries/stress/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ variables:


jobs:

- job: linux
displayName: Docker Linux
timeoutInMinutes: 120
pool:
name: Hosted Ubuntu 1604

Expand All @@ -36,7 +36,7 @@ jobs:

- bash: |
$(dockerfilesFolder)/build-docker-sdk.ps1 -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION)
displayName: Build Libraries
displayName: Build CLR and Libraries
- bash: |
$(httpStressProject)/run-docker-compose.ps1 -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage)
Expand All @@ -48,7 +48,8 @@ jobs:
displayName: Run HttpStress
- job: windows
displayName: Docker Nano Server
displayName: Docker NanoServer
timeoutInMinutes: 120
pool:
vmImage: 'windows-latest'

Expand All @@ -60,7 +61,7 @@ jobs:

- pwsh: |
$(dockerfilesFolder)/build-docker-sdk.ps1 -w -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION)
displayName: Build Libraries
displayName: Build CLR and Libraries
- pwsh: |
$(httpStressProject)/run-docker-compose.ps1 -w -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage)
Expand Down
8 changes: 5 additions & 3 deletions eng/pipelines/libraries/stress/ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:

- job: linux
displayName: Docker Linux
timeoutInMinutes: 120
pool:
name: Hosted Ubuntu 1604

Expand All @@ -36,7 +37,7 @@ jobs:

- bash: |
$(dockerfilesFolder)/build-docker-sdk.ps1 -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION)
displayName: Build Libraries
displayName: Build CLR and Libraries
- bash: |
$(sslStressProject)/run-docker-compose.ps1 -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage)
Expand All @@ -48,7 +49,8 @@ jobs:
displayName: Run SslStress
- job: windows
displayName: Docker Nano Server
displayName: Docker NanoServer
timeoutInMinutes: 120
pool:
vmImage: 'windows-latest'

Expand All @@ -60,7 +62,7 @@ jobs:

- pwsh: |
$(dockerfilesFolder)/build-docker-sdk.ps1 -w -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION)
displayName: Build Libraries
displayName: Build CLR and Libraries
- pwsh: |
$(sslStressProject)/run-docker-compose.ps1 -w -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage)
Expand Down

0 comments on commit 35fe82c

Please sign in to comment.