From ccc66f977b5c034443b10cb9d20f956150c56a50 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 21 Jan 2022 15:16:15 -0800
Subject: [PATCH] [main] Use 1ES machines for official builds (#39684)
---
.azure/pipelines/ci.yml | 3 ++-
.azure/pipelines/jobs/default-build.yml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 63172f92af0..5aa7a5d4b99 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -747,7 +747,8 @@ stages:
- Helix_x64
- Source_Build_Managed
pool:
- vmImage: windows-latest
+ name: NetCore1ESPool-Svc-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
enablePublishBuildArtifacts: true # publish artifacts/log files
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 559cecdc849..f5365e9c850 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -108,9 +108,9 @@ jobs:
${{ if eq(parameters.agentOs, 'macOS') }}:
vmImage: macOS-10.15
${{ if eq(parameters.agentOs, 'Linux') }}:
- ${{ if eq(parameters.useHostedUbuntu, true) }}:
+ ${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
vmImage: ubuntu-18.04
- ${{ if eq(parameters.useHostedUbuntu, false) }}:
+ ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
--
GitLab