diff options
author | Ulises Hernandez <ulisesh@microsoft.com> | 2021-11-04 19:49:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-04 19:49:51 +0300 |
commit | 7b19c719a90bf572a3d6dec17090efd3e9cc6d34 (patch) | |
tree | 6f000cf42190b9485237a43c7fe9218cf899236e /eng/pipelines | |
parent | d55da65b6a6a13a9012e5b49cd6b38238402d60e (diff) |
Change hosted pool (#57785)
* Use 1ES hosted pool
* Add windows and close queues
* Small pool name change
Diffstat (limited to 'eng/pipelines')
-rw-r--r-- | eng/pipelines/common/xplat-setup.yml | 16 | ||||
-rw-r--r-- | eng/pipelines/libraries/stress/http.yml | 8 | ||||
-rw-r--r-- | eng/pipelines/libraries/stress/ssl.yml | 8 | ||||
-rw-r--r-- | eng/pipelines/official/jobs/prepare-signed-artifacts.yml | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index bec9c454c68..29ea4ed15f8 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -104,13 +104,13 @@ 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')) }}: - 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 + name: NetCore1ESPool-Svc-Public + 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 2e55d05c553..2d66f2aaa3b 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 @@ -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 53fb9ad8340..b3168c6a875 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 @@ -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 187871cd324..0e05beed101 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: |