From 950d0911524fbd700c7c7c787f038cd8113f70e7 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Thu, 17 May 2018 16:12:20 -0400 Subject: [PATCH] Disable multissltests.py under VSTS (GH-6955) --- .vsts/linux-buildbot.yml | 9 +-------- .vsts/linux-coverage.yml | 9 +-------- .vsts/linux-deps.yml | 8 +------- .vsts/linux-pr.yml | 9 +-------- 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml index d75d7f57650e..76222d10c48e 100644 --- a/.vsts/linux-buildbot.yml +++ b/.vsts/linux-buildbot.yml @@ -17,10 +17,7 @@ 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)" +#variables: steps: @@ -35,8 +32,6 @@ 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: echo ##vso[task.prependpath]$(OPENSSL_DIR) - displayName: 'Add $(OPENSSL_DIR) to PATH' - script: > sudo apt-get -yq install build-essential @@ -55,8 +50,6 @@ steps: libffi-dev uuid-dev 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)' diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml index 3657b1720ee2..930c9c6b76dc 100644 --- a/.vsts/linux-coverage.yml +++ b/.vsts/linux-coverage.yml @@ -17,10 +17,7 @@ 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)" +#variables: steps: - checkout: self @@ -34,8 +31,6 @@ 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: echo ##vso[task.prependpath]$(OPENSSL_DIR) - displayName: 'Add $(OPENSSL_DIR) to PATH' - script: > sudo apt-get -yq install build-essential @@ -54,8 +49,6 @@ steps: libffi-dev uuid-dev 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 diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml index b6c8a3690ea1..540b76ec54c3 100644 --- a/.vsts/linux-deps.yml +++ b/.vsts/linux-deps.yml @@ -4,16 +4,12 @@ # 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)" +#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: echo ##vso[task.prependpath]$(OPENSSL_DIR) - displayName: 'Add $(OPENSSL_DIR) to PATH' - script: > sudo apt-get -yq install build-essential @@ -32,5 +28,3 @@ steps: libffi-dev uuid-dev 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-pr.yml b/.vsts/linux-pr.yml index 7f4d458f5a7c..83df9b436881 100644 --- a/.vsts/linux-pr.yml +++ b/.vsts/linux-pr.yml @@ -17,10 +17,7 @@ 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)" +#variables: steps: - checkout: self @@ -34,8 +31,6 @@ 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: echo ##vso[task.prependpath]$(OPENSSL_DIR) - displayName: 'Add $(OPENSSL_DIR) to PATH' - script: > sudo apt-get -yq install build-essential @@ -54,8 +49,6 @@ steps: libffi-dev uuid-dev 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 -- 2.47.3