Skip to content

Commit 51f69a6

Browse files
N. Taylor Mullendougbu
andauthored
Use different Ubuntu pools for Ubuntu tests to avoid disk space issues. (#20742)
- Use different Ubuntu pools for Ubuntu tests to avoid disk space issues. - Updated the `default-build.yml` to have a new parameter specific to Ubuntu listed `useHostedUbuntu`. If we feel the need to expand the parameters usage outside of the Ubuntu configuration we can always rename to `useHosted`. Also didn't want to touch the `isTestingJob` because I wasn't sure of hte implications. - Updated the Ubuntu test job to turn off hosted pools. Fixes https://github.com/dotnet/aspnetcore-internal/issues/3574 - Hmm, are `queue` names case-sensitive? - Correct `useHostedUbuntu: false` placement - Correct placement of `useHostedUbuntu: true` default - Try adding `--without-http_rewrite_module` to nginx configuration - also add `set -euo pipefail` to the script for fast failure Co-authored-by: Doug Bunting <[email protected]>
1 parent 8109690 commit 51f69a6

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.azure/pipelines/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ stages:
633633
jobDisplayName: "Test: Ubuntu 16.04 x64"
634634
agentOs: Linux
635635
isTestingJob: true
636+
useHostedUbuntu: false
636637
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
637638
beforeBuild:
638639
- bash: "./eng/scripts/install-nginx-linux.sh"

.azure/pipelines/jobs/default-build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ parameters:
5959
installNodeJs: true
6060
installJdk: true
6161
timeoutInMinutes: 180
62+
useHostedUbuntu: true
6263

6364
# We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
6465
# This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build
@@ -91,7 +92,15 @@ jobs:
9192
${{ if eq(parameters.agentOs, 'macOS') }}:
9293
vmImage: macOS-10.14
9394
${{ if eq(parameters.agentOs, 'Linux') }}:
94-
vmImage: ubuntu-16.04
95+
${{ if eq(parameters.useHostedUbuntu, true) }}:
96+
vmImage: ubuntu-16.04
97+
${{ if eq(parameters.useHostedUbuntu, false) }}:
98+
${{ if eq(variables['System.TeamProject'], 'public') }}:
99+
name: NetCorePublic-Pool
100+
queue: BuildPool.Ubuntu.1604.Amd64.Open
101+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
102+
name: NetCoreInternal-Pool
103+
queue: BuildPool.Ubuntu.1604.Amd64
95104
${{ if eq(parameters.agentOs, 'Windows') }}:
96105
${{ if eq(variables['System.TeamProject'], 'public') }}:
97106
name: NetCorePublic-Pool

eng/scripts/install-nginx-linux.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/env bash
22

3+
set -euo pipefail
4+
35
curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/
4-
./configure --prefix=$HOME/nginxinstall --with-http_ssl_module
6+
./configure --prefix=$HOME/nginxinstall --with-http_ssl_module --without-http_rewrite_module
57
make
68
make install
7-
echo "##vso[task.prependpath]$HOME/nginxinstall/sbin"
9+
echo "##vso[task.prependpath]$HOME/nginxinstall/sbin"

0 commit comments

Comments
 (0)