From 78364c20324edec1dc854b89f0c92bfb5af59746 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:09:16 -0700 Subject: [PATCH 1/6] Update VSTS to Azure DevOps and fix issue with Heroku packages --- .vsts/docs.yml | 2 +- .vsts/linux-buildbot.yml | 3 ++- .vsts/linux-coverage.yml | 3 ++- .vsts/linux-deps.yml | 1 + .vsts/linux-pr.yml | 3 ++- .vsts/macos-buildbot.yml | 2 +- .vsts/macos-pr.yml | 2 +- README.rst | 18 +++++++++--------- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.vsts/docs.yml b/.vsts/docs.yml index 93a7282f770ab4e..8a342ca440c92fa 100644 --- 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 16.04' trigger: branches: diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml index fc2c8ca2486e1b4..cbeed10c8d28606 100644 --- 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 16.04' trigger: branches: @@ -33,6 +33,7 @@ steps: # 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 + continueOnError: true displayName: 'Update apt-get lists' - script: echo ##vso[task.prependpath]$(OPENSSL_DIR) diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml index 1112555ab93f9b5..1e38380dc87cf69 100644 --- 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 16.04' trigger: branches: @@ -44,6 +44,7 @@ steps: # 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' + continueOnError: true condition: and(succeeded(), ne(variables['DocOnly'], 'true')) - script: echo ##vso[task.prependpath]$(OPENSSL_DIR) diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml index 83b0b5961721d0c..1b999655978094a 100644 --- a/.vsts/linux-deps.yml +++ b/.vsts/linux-deps.yml @@ -10,6 +10,7 @@ parameters: steps: - script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update + continueOnError: true displayName: 'Update apt-get lists' - script: echo ##vso[task.prependpath]$(OPENSSL_DIR) diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml index 145ebb38016a612..17723d6eed7ca94 100644 --- 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 16.04' trigger: branches: @@ -44,6 +44,7 @@ steps: # 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' + continueOnError: true condition: and(succeeded(), ne(variables['DocOnly'], 'true')) - script: echo ##vso[task.prependpath]$(OPENSSL_DIR) diff --git a/.vsts/macos-buildbot.yml b/.vsts/macos-buildbot.yml index d9b2297283b0a86..f58ea1626144af6 100644 --- 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 a3fd4487ed3a703..c56e66b5090b3b5 100644 --- 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 6047e7aef2cbd70..c65f6e29d41394d 100644 --- a/README.rst +++ b/README.rst @@ -9,17 +9,17 @@ This is Python version 3.8.0 alpha 0 :alt: CPython build status on Appveyor :target: https://ci.appveyor.com/project/python/cpython/branch/master -.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Linux-Buildbot?branchName=master&label=Linux - :alt: CPython build status on VSTS (Linux) - :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=6&branchName=master +.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Linux-Buildbot?branchName=master&label=Linux + :alt: CPython build status on Azure DevOps (Linux) + :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=6&branchName=master -.. image:: https://python.visualstudio.com/cpython/_apis/build/status/macOS-Buildbot?branchName=master&label=macOS - :alt: CPython build status on VSTS (macOS) - :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=5&branchName=master +.. image:: https://dev.azure.com/python/cpython/_apis/build/status/macOS-Buildbot?branchName=master&label=macOS + :alt: CPython build status on Azure DevOps (macOS) + :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=5&branchName=master -.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Windows-Buildbot?branchName=master&label=Windows - :alt: CPython build status on VSTS (Windows) - :target: https://python.visualstudio.com/cpython/_build/latest?definitionId=4&branchName=master +.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Windows-Buildbot?branchName=master&label=Windows + :alt: CPython build status on Azure DevOps (Windows) + :target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=master .. image:: https://codecov.io/gh/python/cpython/branch/master/graph/badge.svg :alt: CPython code coverage on Codecov From 11c9a413a7553b84effd0c69238c502352a6bbb2 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:11:06 -0700 Subject: [PATCH 2/6] Fix Ubuntu pool name --- .vsts/linux-buildbot.yml | 2 +- .vsts/linux-coverage.yml | 2 +- .vsts/linux-pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml index cbeed10c8d28606..e537db6956a1700 100644 --- a/.vsts/linux-buildbot.yml +++ b/.vsts/linux-buildbot.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: 'Hosted Ubuntu 16.04' + name: 'Hosted Ubuntu 1604' trigger: branches: diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml index 1e38380dc87cf69..d451e01d8692f57 100644 --- a/.vsts/linux-coverage.yml +++ b/.vsts/linux-coverage.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: 'Hosted Ubuntu 16.04' + name: 'Hosted Ubuntu 1604' trigger: branches: diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml index 17723d6eed7ca94..183134d031eb06a 100644 --- a/.vsts/linux-pr.yml +++ b/.vsts/linux-pr.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: 'Hosted Ubuntu 16.04' + name: 'Hosted Ubuntu 1604' trigger: branches: From 31b5b028d402bde9942abeab36837c5cef8924ee Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:17:24 -0700 Subject: [PATCH 3/6] Move dependencies no install_deps.sh script --- .vsts/install_deps.sh | 19 +++++++++++++++++++ .vsts/linux-buildbot.yml | 25 +------------------------ .vsts/linux-coverage.yml | 26 +------------------------- .vsts/linux-pr.yml | 26 +------------------------- 4 files changed, 22 insertions(+), 74 deletions(-) create mode 100644 .vsts/install_deps.sh diff --git a/.vsts/install_deps.sh b/.vsts/install_deps.sh new file mode 100644 index 000000000000000..7b98cfddb6c406f --- /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 e537db6956a1700..51704004893795c 100644 --- a/.vsts/linux-buildbot.yml +++ b/.vsts/linux-buildbot.yml @@ -30,32 +30,9 @@ steps: #- 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 - continueOnError: true - 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 +- script: ./.vsts/install_deps.sh displayName: 'Install dependencies' - script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux displayName: 'python multissltests.py' diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml index d451e01d8692f57..cc03e4258ab437b 100644 --- a/.vsts/linux-coverage.yml +++ b/.vsts/linux-coverage.yml @@ -40,33 +40,9 @@ steps: #- 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' - continueOnError: true - condition: and(succeeded(), ne(variables['DocOnly'], 'true')) - - 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 +- script: ./.vsts/install_deps.sh displayName: 'Install dependencies' condition: and(succeeded(), ne(variables['DocOnly'], 'true')) - script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml index 183134d031eb06a..6e4ac7c65c4dc4c 100644 --- a/.vsts/linux-pr.yml +++ b/.vsts/linux-pr.yml @@ -40,35 +40,11 @@ steps: #- 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' - continueOnError: true - condition: and(succeeded(), ne(variables['DocOnly'], 'true')) - - script: echo ##vso[task.prependpath]$(OPENSSL_DIR) displayName: 'Add $(OPENSSL_DIR) to PATH' 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')) From 1fb68719c2ac7965648b4e35ed02354a93f6d2f4 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:21:12 -0700 Subject: [PATCH 4/6] Add executable bit to install_deps script --- .vsts/install_deps.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .vsts/install_deps.sh diff --git a/.vsts/install_deps.sh b/.vsts/install_deps.sh old mode 100644 new mode 100755 From 4b84b2e1f33b9f704b973996794dc130cfed9a61 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:23:55 -0700 Subject: [PATCH 5/6] Fix pool name in docs build --- .vsts/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts/docs.yml b/.vsts/docs.yml index 8a342ca440c92fa..0be07b31dfcc72d 100644 --- a/.vsts/docs.yml +++ b/.vsts/docs.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: 'Hosted Ubuntu 16.04' + name: 'Hosted Ubuntu 1604' trigger: branches: From 01c6afc1c2a9454a689603fb4f4bc84fcf4ee918 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 09:24:46 -0700 Subject: [PATCH 6/6] Remove old dependencies script --- .vsts/linux-deps.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .vsts/linux-deps.yml diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml deleted file mode 100644 index 1b999655978094a..000000000000000 --- a/.vsts/linux-deps.yml +++ /dev/null @@ -1,38 +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: - OPENSSL: 1.1.0g - OPENSSL_DIR: "$(build.sourcesDirectory)/multissl/openssl/$(OPENSSL)" - -steps: -- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update - continueOnError: true - 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'