Update VSTS to Azure DevOps and simplify dependencies (GH-9168)

diff --git a/.vsts/docs.yml b/.vsts/docs.yml
index 93a7282f770ab4edf53fb60ae57dca0a45ae654d..0be07b31dfcc72de676a9ef3f17396462b854d81 100644 (file)
--- a/.vsts/docs.yml
+++ b/.vsts/docs.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted Linux Preview
+  name: 'Hosted Ubuntu 1604'
 
 trigger:
   branches:

diff --git a/.vsts/install_deps.sh b/.vsts/install_deps.sh
new file mode 100755 (executable)
index 0000000..7b98cfd
--- /dev/null
+++ b/.vsts/install_deps.sh
@@ -0,0 +1,19 @@
+sudo apt-get update
+
+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

diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml
index 4c01bdd165d12ddbef33dae96517b8c63a847436..09084e07df77cce10469f9a3e248b103db681a7b 100644 (file)
--- a/.vsts/linux-buildbot.yml
+++ b/.vsts/linux-buildbot.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted Linux Preview
+  name: 'Hosted Ubuntu 1604'
 
 trigger:
   branches:
@@ -25,31 +25,7 @@ steps:
   clean: true
   fetchDepth: 5
 
-#- 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'
-
-- 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
+- script: ./.vsts/install_deps.sh
   displayName: 'Install dependencies'
 
 - script: ./configure --with-pydebug

diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml
index 62fafe347688e5ae6f3e549ce54a29e650c8d08d..4eb75efc8040e218847ef0de5cbff01c2c1bb44a 100644 (file)
--- a/.vsts/linux-coverage.yml
+++ b/.vsts/linux-coverage.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted Linux Preview
+  name: 'Hosted Ubuntu 1604'
 
 trigger:
   branches:
@@ -35,34 +35,9 @@ steps:
   displayName: Detect doc-only changes
   condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
 
-#- 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'
-  condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
-
-- 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
+- script: ./.vsts/install_deps.sh
   displayName: 'Install dependencies'
-
+  condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
 
 - script: ./configure --with-pydebug
   displayName: 'Configure CPython (debug)'

diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml
deleted file mode 100644 (file)
index d1922a7..0000000
--- a/.vsts/linux-deps.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Note: this file is not currently used, but when template support comes to VSTS it
-# will be referenced from the other scripts..
-
-# Current docs for the syntax of this file are at:
-#  https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted.md
-
-#parameters:
-
-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'
-
-- 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'

diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml
index 922fa81bc414857c89845b84abc225c6b66a3032..945ac097e5e850ce22268df644545503aeb51a63 100644 (file)
--- a/.vsts/linux-pr.yml
+++ b/.vsts/linux-pr.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted Linux Preview
+  name: 'Hosted Ubuntu 1604'
 
 trigger:
   branches:
@@ -35,36 +35,10 @@ steps:
   displayName: Detect doc-only changes
   condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
 
-#- 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'
-  condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
-
-- 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
+- script: ./.vsts/install_deps.sh
   displayName: 'Install dependencies'
   condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
 
-
 - script: ./configure --with-pydebug
   displayName: 'Configure CPython (debug)'
   condition: and(succeeded(), ne(variables['DocOnly'], 'true'))

diff --git a/.vsts/macos-buildbot.yml b/.vsts/macos-buildbot.yml
index d9b2297283b0a86d568a57710f6a6ba15af35c36..f58ea1626144af603c73a3cedabd767df7abdc02 100644 (file)
--- a/.vsts/macos-buildbot.yml
+++ b/.vsts/macos-buildbot.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted macOS Preview
+  name: Hosted macOS
 
 trigger:
   branches:

diff --git a/.vsts/macos-pr.yml b/.vsts/macos-pr.yml
index a3fd4487ed3a70316e31e0174d28712e8c650286..c56e66b5090b3b5b33cef8c70680f20e049c8a74 100644 (file)
--- a/.vsts/macos-pr.yml
+++ b/.vsts/macos-pr.yml
@@ -4,7 +4,7 @@
 name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
 
 queue:
-  name: Hosted macOS Preview
+  name: Hosted macOS
 
 trigger:
   branches:

diff --git a/README.rst b/README.rst
index c9b518bcf2cbae11e916daed4a25e5119c004089..a2c76ac71dee827616e9a40dab829eb86270fabf 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -9,17 +9,17 @@ This is Python version 3.6.6+
    :alt: CPython build status on Appveyor
    :target: https://ci.appveyor.com/project/python/cpython/branch/3.6
 
-.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Linux-Buildbot?branchName=3.6&label=Linux
+.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Linux-Buildbot?branchName=3.6&label=Linux
    :alt: CPython build status on VSTS (Linux)
-   :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=6&branchName=3.6
+   :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=6&branchName=3.6
 
-.. image:: https://python.visualstudio.com/cpython/_apis/build/status/macOS-Buildbot?branchName=3.6&label=macOS
+.. image:: https://dev.azure.com/python/cpython/_apis/build/status/macOS-Buildbot?branchName=3.6&label=macOS
    :alt: CPython build status on VSTS (macOS)
-   :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=5&branchName=3.6
+   :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=5&branchName=3.6
 
-.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Windows-Buildbot?branchName=3.6&label=Windows
+.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Windows-Buildbot?branchName=3.6&label=Windows
    :alt: CPython build status on VSTS (Windows)
-   :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=4&branchName=3.6
+   :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=3.6
 
 .. image:: https://codecov.io/gh/python/cpython/branch/3.6/graph/badge.svg
    :alt: CPython code coverage on Codecov