From 2dce47ee4a7f5bfa97bdf708059f1f3d9c481016 Mon Sep 17 00:00:00 2001 From: Ulises Hernandez Date: Thu, 19 Aug 2021 14:40:56 -0700 Subject: [PATCH 1/3] Use 1ES hosted pool --- eng/pipelines/common/xplat-setup.yml | 4 ++-- eng/pipelines/libraries/stress/http.yml | 4 ++-- eng/pipelines/libraries/stress/ssl.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index bec9c454c68e5f..9711a0649ac75a 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -104,8 +104,8 @@ jobs: pool: # Public Linux Build Pool ${{ if and(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Browser'), eq(variables['System.TeamProject'], 'public')) }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1804.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open # Official Build Linux Pool ${{ if and(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Browser'), ne(variables['System.TeamProject'], 'public')) }}: diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 2e55d05c5535e5..ce665d3d640075 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -27,8 +27,8 @@ jobs: displayName: Docker Linux timeoutInMinutes: 120 pool: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1804.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open steps: - checkout: self diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index 53fb9ad8340815..b064718a6e5a2f 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -28,8 +28,8 @@ jobs: displayName: Docker Linux timeoutInMinutes: 120 pool: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1804.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open steps: - checkout: self From 101acbeb3f1514fcb6c25f7fca0d3ae520156bbf Mon Sep 17 00:00:00 2001 From: Ulises Hernandez Date: Tue, 31 Aug 2021 18:59:05 -0700 Subject: [PATCH 2/3] Add windows and close queues --- eng/pipelines/common/xplat-setup.yml | 10 +++++----- eng/pipelines/libraries/stress/http.yml | 4 ++-- eng/pipelines/libraries/stress/ssl.yml | 4 ++-- .../official/jobs/prepare-signed-artifacts.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 9711a0649ac75a..8e89e558f11fcf 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -109,8 +109,8 @@ jobs: # Official Build Linux Pool ${{ if and(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Browser'), ne(variables['System.TeamProject'], 'public')) }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1804.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 # Public OSX Build Pool ${{ if eq(parameters.osGroup, 'OSX') }}: @@ -126,13 +126,13 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: - name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index ce665d3d640075..2d66f2aaa3bb04 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -52,8 +52,8 @@ jobs: displayName: Docker NanoServer timeoutInMinutes: 120 pool: - name: NetCorePublic-Pool - queue: BuildPool.Server.Amd64.VS2019.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open steps: - checkout: self diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index b064718a6e5a2f..b3168c6a875980 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -53,8 +53,8 @@ jobs: displayName: Docker NanoServer timeoutInMinutes: 120 pool: - name: NetCorePublic-Pool - queue: BuildPool.Server.Amd64.VS2019.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open steps: - checkout: self diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 187871cd324327..0e05beed101adb 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -9,8 +9,8 @@ jobs: displayName: Prepare Signed Artifacts dependsOn: ${{ parameters.dependsOn }} pool: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 # Double the default timeout. timeoutInMinutes: 120 workspace: From ef15d6fad3598890a688f8a1937d9a7f61fa9f71 Mon Sep 17 00:00:00 2001 From: Ulises Hernandez Date: Tue, 31 Aug 2021 19:06:23 -0700 Subject: [PATCH 3/3] Small pool name change --- eng/pipelines/common/xplat-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 8e89e558f11fcf..29ea4ed15f8b1a 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -131,7 +131,7 @@ jobs: # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: - name: NetCorePublic-Pool + name: NetCore1ESPool-Svc-Public demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open