python · davidstaheli · Sep 4, 2018 · Sep 4, 2018 · Sep 5, 2018 · Sep 6, 2018
diff --git a/.vsts/docs-release.yml b/.vsts/docs-release.yml
@@ -3,41 +3,44 @@
 
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
-queue:
-  name: Hosted Linux Preview
-
-#variables:
-
-steps:
-- checkout: self
-  clean: true
-  fetchDepth: 5
-
-- script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full 
-  displayName: 'Install LaTeX'
-
-- task: UsePythonVersion@0
-  displayName: 'Use Python 3.6 or later'
-  inputs:
-    versionSpec: '>=3.6'
-
-- script: python -m pip install sphinx blurb python-docs-theme
-  displayName: 'Install build dependencies'
-
-- script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
-  workingDirectory: '$(build.sourcesDirectory)/Doc'
-  displayName: 'Build documentation'
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish build'
-  inputs:
-    PathToPublish: '$(build.sourcesDirectory)/Doc/build'
-    ArtifactName: build
-    publishLocation: Container
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish dist'
-  inputs:
-    PathToPublish: '$(build.sourcesDirectory)/Doc/dist'
-    ArtifactName: dist
-    publishLocation: Container
+jobs:
+
+- job: docsRelease
+  pool:
+    vmImage: 'Ubuntu 16.04'
+
+  #variables:
+
+  steps:
+  - checkout: self
+    clean: true
+    fetchDepth: 5
+
+  - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full 
+    displayName: 'Install LaTeX'
+
+  - task: UsePythonVersion@0
+    displayName: 'Use Python 3.6 or later'
+    inputs:
+      versionSpec: '>=3.6'
+
+  - script: python -m pip install sphinx blurb python-docs-theme
+    displayName: 'Install build dependencies'
+
+  - script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb'
+    workingDirectory: '$(build.sourcesDirectory)/Doc'
+    displayName: 'Build documentation'
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish build'
+    inputs:
+      PathToPublish: '$(build.sourcesDirectory)/Doc/build'
+      ArtifactName: build
+      publishLocation: Container
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish dist'
+    inputs:
+      PathToPublish: '$(build.sourcesDirectory)/Doc/dist'
+      ArtifactName: dist
+      publishLocation: Container
diff --git a/.vsts/docs.yml b/.vsts/docs.yml
@@ -2,10 +2,6 @@
 #  https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted.md
 
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
-
-queue:
-  name: Hosted Linux Preview
-
 trigger:
   branches:
     include:
@@ -16,43 +12,49 @@ trigger:
     include:
     - Doc/*
 
-#variables:
-
-steps:
-- checkout: self
-  clean: true
-  fetchDepth: 5
-
-- script: |
-   git fetch -q origin $(system.pullRequest.targetBranch)
-   if ! git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD) | grep -qE '(\.rst$|^Doc|^Misc)'
-   then
-     echo "No docs were updated, stopping build process."
-     echo "##vso[task.setvariable variable=NoDocs]true"
-     exit
-   fi
-  displayName: Detect doc-only changes
-  condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
-
-- task: UsePythonVersion@0
-  displayName: 'Use Python 3.6 or later'
-  inputs:
-    versionSpec: '>=3.6'
-  condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
-
-- script: python -m pip install sphinx~=1.6.1 blurb python-docs-theme
-  displayName: 'Install build dependencies'
-  condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
-
-- script: make check suspicious html PYTHON=python
-  workingDirectory: '$(build.sourcesDirectory)/Doc'
-  displayName: 'Build documentation'
-  condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish build'
-  condition: and(and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')), ne(variables['NoDocs'], 'true'))
-  inputs:
-    PathToPublish: '$(build.sourcesDirectory)/Doc/build'
-    ArtifactName: build
-    publishLocation: Container
+jobs:
+
+- job: docs
+  pool:
+    vmImage: 'Ubuntu 16.04'
+
+  #variables:
+
+  steps:
+  - checkout: self
+    clean: true
+    fetchDepth: 5
+
+  - script: |
+      git fetch -q origin $(system.pullRequest.targetBranch)
+      if ! git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD) | grep -qE '(\.rst$|^Doc|^Misc)'
+      then
+        echo "No docs were updated, stopping build process."
+        echo "##vso[task.setvariable variable=NoDocs]true"
+        exit
+      fi
+    displayName: Detect doc-only changes
+    condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
+
+  - task: UsePythonVersion@0
+    displayName: 'Use Python 3.6 or later'
+    inputs:
+      versionSpec: '>=3.6'
+    condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
+
+  - script: python -m pip install sphinx~=1.6.1 blurb python-docs-theme
+    displayName: 'Install build dependencies'
+    condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
+
+  - script: make check suspicious html PYTHON=python
+    workingDirectory: '$(build.sourcesDirectory)/Doc'
+    displayName: 'Build documentation'
+    condition: and(succeeded(), ne(variables['NoDocs'], 'true'))
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish build'
+    condition: and(and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')), ne(variables['NoDocs'], 'true'))
+    inputs:
+      PathToPublish: '$(build.sourcesDirectory)/Doc/build'
+      ArtifactName: build
+      publishLocation: Container
diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml
@@ -2,10 +2,6 @@
 #  https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted.md
 
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
-
-queue:
-  name: Hosted Linux Preview
-
 trigger:
   branches:
     include:
@@ -17,56 +13,61 @@ trigger:
     - Doc/*
     - Tools/*
 
-variables:
-  # Copy-pasted from linux-deps.yml until template support arrives
-  OPENSSL: 1.1.0g
-  OPENSSL_DIR: "$(build.sourcesDirectory)/multissl/openssl/$(OPENSSL)"
+jobs:
+
+- job: linuxBuildBot
+  pool:
+    vmImage: 'Ubuntu 16.04'
 
+  variables:
+    # Copy-pasted from linux-deps.yml until template support arrives
+    OPENSSL: 1.1.0g
+    OPENSSL_DIR: "$(build.sourcesDirectory)/multissl/openssl/$(OPENSSL)"
 
-steps:
-- checkout: self
-  clean: true
-  fetchDepth: 5
+  steps:
+  - checkout: self
+    clean: true
+    fetchDepth: 5
 
-#- template: linux-deps.yml
+  #- template: linux-deps.yml
 
-# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
-# For now, we copy/paste the steps
-- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
-  displayName: 'Update apt-get lists'
+  # See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
+  # For now, we copy/paste the steps
+  - script: sudo apt-get update
+    displayName: 'Update apt-get lists'
 
-- script: echo ##vso[task.prependpath]$(OPENSSL_DIR)
-  displayName: 'Add $(OPENSSL_DIR) to PATH'
-- script: >
-    sudo apt-get -yq install
-    build-essential
-    zlib1g-dev
-    libbz2-dev
-    liblzma-dev
-    libncurses5-dev
-    libreadline6-dev
-    libsqlite3-dev
-    libssl-dev
-    libgdbm-dev
-    tk-dev
-    lzma
-    lzma-dev
-    liblzma-dev
-    libffi-dev
-    uuid-dev
-    xvfb
-  displayName: 'Install dependencies'
-- script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux
-  displayName: 'python multissltests.py'
+  - script: echo ##vso[task.prependpath]$(OPENSSL_DIR)
+    displayName: 'Add $(OPENSSL_DIR) to PATH'
+  - script: >
+      sudo apt-get -yq install
+      build-essential
+      zlib1g-dev
+      libbz2-dev
+      liblzma-dev
+      libncurses5-dev
+      libreadline6-dev
+      libsqlite3-dev
+      libssl-dev
+      libgdbm-dev
+      tk-dev
+      lzma
+      lzma-dev
+      liblzma-dev
+      libffi-dev
+      uuid-dev
+      xvfb
+    displayName: 'Install dependencies'
+  - script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux
+    displayName: 'python multissltests.py'
 
-- script: ./configure --with-pydebug
-  displayName: 'Configure CPython (debug)'
+  - script: ./configure --with-pydebug
+    displayName: 'Configure CPython (debug)'
 
-- script: make -s -j4
-  displayName: 'Build CPython'
+  - script: make -s -j4
+    displayName: 'Build CPython'
 
-- script: make pythoninfo
-  displayName: 'Display build info'
+  - script: make pythoninfo
+    displayName: 'Display build info'
 
-- script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
-  displayName: 'Tests'
+  - script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu"
+    displayName: 'Tests'