Merge pull request #17978 from chrisrpatterson/feature/vsts-ci-schema-change

VSTS CI Schema Change

README.md

@@ -1,6 +1,6 @@
 ![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
 
-[![Build status](https://github.visualstudio.com/Atom/_apis/build/status/Atom%20Production%20Branches?branch=master)](https://github.visualstudio.com/Atom/_build/latest?definitionId=32&branch=master) [![Linux Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom)
+[![Build status](https://github.visualstudio.com/Atom/_apis/build/status/Atom%20Production%20Branches?branchName=master)](https://github.visualstudio.com/Atom/_build/latest?definitionId=32&branchName=master) [![Linux Build Status](https://travis-ci.org/atom/atom.svg?branch=master)](https://travis-ci.org/atom/atom) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/1tkktwh654w07eim?svg=true)](https://ci.appveyor.com/project/Atom/atom)
 [![Dependency Status](https://david-dm.org/atom/atom.svg)](https://david-dm.org/atom/atom)
 [![Join the Atom Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com)
 

script/vsts/nightly-release.yml

@@ -1,6 +1,6 @@
-phases:
+jobs:
 
-- phase: GetReleaseVersion
+- job: GetReleaseVersion
   steps:
   # This has to be done separately because VSTS inexplicably
   # exits the script block after `npm install` completes.
@@ -16,8 +16,9 @@ phases:
 - template: platforms/macos.yml
 - template: platforms/linux.yml
 
-- phase: Release
-  queue: Hosted  # Need this for Python 2.7
+- job: Release
+  pool: 
+    vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
 
   dependsOn:
   - GetReleaseVersion

script/vsts/platforms/linux.yml

@@ -1,11 +1,12 @@
-phases:
-- phase: Linux
+jobs:
+- job: Linux
   dependsOn: GetReleaseVersion
+  timeoutInMinutes: 180
+
   variables:
     ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-  queue:
-    name: Hosted Ubuntu 1604
-    timeoutInMinutes: 180
+  pool:
+    vmImage: ubuntu-16.04
 
   steps:
   - task: NodeTool@0
@@ -47,6 +48,7 @@ phases:
       ArtifactName: atom.x86_64.rpm
       ArtifactType: Container
     displayName: Upload atom.x84_64.rpm
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -54,6 +56,7 @@ phases:
       ArtifactName: atom-amd64.deb
       ArtifactType: Container
     displayName: Upload atom-amd64.deb
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -61,3 +64,4 @@ phases:
       ArtifactName: atom-amd64.tar.gz
       ArtifactType: Container
     displayName: Upload atom-amd64.tar.gz
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))

script/vsts/platforms/macos.yml

@@ -1,13 +1,14 @@
-phases:
-- phase: macOS
+jobs:
+- job: macOS
   dependsOn: GetReleaseVersion
+  timeoutInMinutes: 180
+
   variables:
     ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
     IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
     IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
-  queue:
-    name: Hosted macOS Preview
-    timeoutInMinutes: 180
+  pool:
+    vmImage: macos-10.13
 
   steps:
   - task: NodeTool@0
@@ -56,6 +57,7 @@ phases:
       ArtifactName: atom-mac.zip
       ArtifactType: Container
     displayName: Upload atom-mac.zip
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -63,6 +65,7 @@ phases:
       ArtifactName: atom-mac-symbols.zip
       ArtifactType: Container
     displayName: Upload atom-mac-symbols.zip
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -70,3 +73,4 @@ phases:
       ArtifactName: atom-api.json
       ArtifactType: Container
     displayName: Upload atom-api.json
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))

script/vsts/platforms/windows.yml

@@ -1,20 +1,22 @@
-phases:
-- phase: Windows
+jobs:
+- job: Windows
   dependsOn: GetReleaseVersion
-  variables:
-    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
-    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
-  queue:
-    name: Hosted
-    timeoutInMinutes: 180
-    parallel: 2
+  timeoutInMinutes: 180
+  strategy:
+    maxParallel: 2
     matrix:
       x64:
         buildArch: x64
       # TODO: x86 is currently not supported on VSTS
       # x86:
       #   buildArch: x86
+  pool:
+    vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
+
+  variables:
+    ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
+    IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+    IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
   steps:
   - task: NodeTool@0
@@ -67,6 +69,7 @@ phases:
       ArtifactName: atom-x64-windows.zip
       ArtifactType: Container
     displayName: Upload atom-x64-windows.zip
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
   - task: PublishBuildArtifacts@1
     inputs:

script/vsts/pull-requests.yml

@@ -1,8 +1,8 @@
 trigger: none  # No CI builds, only PR builds
 
-phases:
+jobs:
 
-- phase: GetReleaseVersion
+- job: GetReleaseVersion
   steps:
   # This has to be done separately because VSTS inexplicably
   # exits the script block after `npm install` completes.

script/vsts/release-branch-build.yml

@@ -2,9 +2,9 @@ trigger:
 - master
 - 1.* # VSTS only supports wildcards at the end
 
-phases:
+jobs:
 
-- phase: GetReleaseVersion
+- job: GetReleaseVersion
   steps:
   # This has to be done separately because VSTS inexplicably
   # exits the script block after `npm install` completes.
@@ -20,8 +20,9 @@ phases:
 - template: platforms/macos.yml
 - template: platforms/linux.yml
 
-- phase: UploadArtifacts
-  queue: Hosted  # Need this for Python 2.7
+- job: UploadArtifacts
+  pool: 
+    vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
 
   dependsOn:
   - GetReleaseVersion
@@ -34,7 +35,7 @@ phases:
     IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
     IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
-  steps:
+  steps:  
   - task: NodeTool@0
     inputs:
       versionSpec: 8.9.3