diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index c48ae0b91e..2c8027374a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -633,6 +633,7 @@ stages: jobDisplayName: "Test: Ubuntu 16.04 x64" agentOs: Linux isTestingJob: true + useHostedUbuntu: false buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) beforeBuild: - bash: "./eng/scripts/install-nginx-linux.sh" diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index df5adbe436..fe2d01308f 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -59,6 +59,7 @@ parameters: installNodeJs: true installJdk: true timeoutInMinutes: 180 + useHostedUbuntu: true # 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). # 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: ${{ if eq(parameters.agentOs, 'macOS') }}: vmImage: macOS-10.14 ${{ if eq(parameters.agentOs, 'Linux') }}: - vmImage: ubuntu-16.04 + ${{ if eq(parameters.useHostedUbuntu, true) }}: + vmImage: ubuntu-16.04 + ${{ if eq(parameters.useHostedUbuntu, false) }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: BuildPool.Ubuntu.1604.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCoreInternal-Pool + queue: BuildPool.Ubuntu.1604.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool diff --git a/eng/scripts/install-nginx-linux.sh b/eng/scripts/install-nginx-linux.sh index b9ad6daf93..bb4bea70b0 100755 --- a/eng/scripts/install-nginx-linux.sh +++ b/eng/scripts/install-nginx-linux.sh @@ -1,7 +1,9 @@ #!/usr/bin/env bash +set -euo pipefail + curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/ -./configure --prefix=$HOME/nginxinstall --with-http_ssl_module +./configure --prefix=$HOME/nginxinstall --with-http_ssl_module --without-http_rewrite_module make make install -echo "##vso[task.prependpath]$HOME/nginxinstall/sbin" \ No newline at end of file +echo "##vso[task.prependpath]$HOME/nginxinstall/sbin"