Skip to content

Commit 7147c87

Browse files
authored
Use new AzDO job schema and recommended hosted agent pool (#823)
* Phases are jobs (rename) * Use new schema, order based on schema doc * Use recommended Hosted Ubuntu 1604 pool
1 parent 333e7c0 commit 7147c87

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

.vsts.pipelines/builds/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# Online: The leg produces a tarball then builds it while connected to the internet.
66
# Offline: The leg produces a tarball then builds it offline. Network disconnected using Docker.
77

8-
phases:
9-
- template: ../phases/ci-linux.yml
8+
jobs:
9+
- template: ../jobs/ci-linux.yml
1010
parameters:
11-
phase: centos71
11+
job: centos71
1212
imageName: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416
1313
matrix:
1414
Production: {}
@@ -17,9 +17,9 @@ phases:
1717
Offline: { type: Offline }
1818
Offline Portable: { type: Offline Portable }
1919

20-
- template: ../phases/ci-linux.yml
20+
- template: ../jobs/ci-linux.yml
2121
parameters:
22-
phase: ubuntu1604
22+
job: ubuntu1604
2323
imageName: microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-c103199-20180628134544
2424

25-
- template: ../phases/ci-osx.yml
25+
- template: ../jobs/ci-osx.yml

.vsts.pipelines/phases/ci-linux.yml renamed to .vsts.pipelines/jobs/ci-linux.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
parameters:
2-
imageName: null
2+
job: null
33
matrix:
44
Production: {}
5-
phase: null
6-
queueDemands: docker
7-
queueName: dnceng-linux-external-temp
5+
pool:
6+
name: Hosted Ubuntu 1604
7+
imageName: null
88

9-
phases:
10-
- phase: ${{ parameters.phase }}
9+
jobs:
10+
- job: ${{ parameters.job }}
11+
strategy:
12+
matrix: ${{ parameters.matrix }}
13+
pool: ${{ parameters.pool }}
14+
timeoutInMinutes: 270
1115
variables:
1216
# Prefix to distinguish artifacts from different legs.
13-
artifactName: ${{ format('$(type) {0}', parameters.phase) }}
17+
artifactName: ${{ format('$(type) {0}', parameters.job) }}
1418
# Use ":z" to set selinux flag for sharing in build-owned root dir. https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label
1519
docker.agentSrc.map: -v $(Build.SourcesDirectory):/agentSrc:z
1620
docker.agentSrc.work: -w /agentSrc
@@ -29,12 +33,6 @@ phases:
2933
tarballName: tarball_$(Build.BuildId)
3034
# Default type, can be overridden by matrix legs.
3135
type: Production
32-
queue:
33-
name: ${{ parameters.queueName }}
34-
demands: ${{ parameters.queueDemands }}
35-
timeoutInMinutes: 270
36-
parallel: 8
37-
matrix: ${{ parameters.matrix }}
3836

3937
steps:
4038
- template: ../steps/docker-cleanup-linux.yml

.vsts.pipelines/phases/ci-osx.yml renamed to .vsts.pipelines/jobs/ci-osx.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
parameters:
2+
job: osx
23
matrix:
34
Production: {}
4-
phase: osx
5-
queueDemands: Agent.OS -equals Darwin
6-
queueName: DotNetCore-Mac
5+
pool:
6+
name: DotNetCore-Mac
7+
demands: Agent.OS -equals Darwin
78

8-
phases:
9-
- phase: ${{ parameters.phase }}
9+
jobs:
10+
- job: ${{ parameters.job }}
11+
strategy:
12+
matrix: ${{ parameters.matrix }}
13+
pool: ${{ parameters.pool }}
14+
timeoutInMinutes: 240
1015
variables:
1116
# Prefix to distinguish artifacts from different legs.
12-
artifactName: ${{ format('$(type) {0}', parameters.phase) }}
17+
artifactName: ${{ format('$(type) {0}', parameters.job) }}
1318
logsDirectory: $(Build.ArtifactStagingDirectory)/logs
1419
SOURCE_BUILD_SKIP_SUBMODULE_CHECK: true
1520
# Default type, can be overridden by matrix legs.
1621
type: Production
17-
queue:
18-
name: ${{ parameters.queueName }}
19-
demands: ${{ parameters.queueDemands }}
20-
timeoutInMinutes: 240
21-
matrix: ${{ parameters.matrix }}
2222

2323
steps:
2424
- checkout: self

0 commit comments

Comments
 (0)