Commit 95f329b4 by Patrick Steinhardt

azure: upgrade to newer hosted VM images

Azure is phasing out old images on March 23rd 2020, but we're currently
still using them. So let's upgrade images as following:

    - Ubuntu 16.04 -> ubuntu-18.04
    - macOS 10.13 -> macOS-10.15
    - Hosted Windows machines -> vs2017-win2016

Each of them is currently the latest version. As the new Microsoft
Windows machine has upgraded to MSVS2017, we need to also adjust our
CMake generators to "Visual Studio 15 2017". As this CMake generator
doesn't accept the target platform name anymore, we instead need to set
it up via either "-A Win32" or "-A x64".

[1]: https://devblogs.microsoft.com/devops/removing-older-images-in-azure-pipelines-hosted-pools/
parent 5ac33ced
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
- job: linux_amd64_xenial_gcc_openssl - job: linux_amd64_xenial_gcc_openssl
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)' displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -25,7 +25,7 @@ jobs: ...@@ -25,7 +25,7 @@ jobs:
- job: linux_amd64_xenial_gcc_mbedtls - job: linux_amd64_xenial_gcc_mbedtls
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)' displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -41,7 +41,7 @@ jobs: ...@@ -41,7 +41,7 @@ jobs:
- job: linux_amd64_xenial_clang_openssl - job: linux_amd64_xenial_clang_openssl
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)' displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -57,7 +57,7 @@ jobs: ...@@ -57,7 +57,7 @@ jobs:
- job: linux_amd64_xenial_clang_mbedtls - job: linux_amd64_xenial_clang_mbedtls
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)' displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: azure-pipelines/docker.yml - template: azure-pipelines/docker.yml
parameters: parameters:
...@@ -71,9 +71,9 @@ jobs: ...@@ -71,9 +71,9 @@ jobs:
GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }} GITTEST_NEGOTIATE_PASSWORD=${{ variables.GITTEST_NEGOTIATE_PASSWORD }}
- job: macos - job: macos
displayName: 'macOS' displayName: 'macOS (amd64; 10.15)'
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS-10.15'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
...@@ -89,31 +89,34 @@ jobs: ...@@ -89,31 +89,34 @@ jobs:
- job: windows_vs_amd64 - job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)' displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: azure-pipelines/bash.yml - template: azure-pipelines/bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- job: windows_vs_x86 - job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)' displayName: 'Windows (x86; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: azure-pipelines/bash.yml - template: azure-pipelines/bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
SKIP_NEGOTIATE_TESTS: true SKIP_NEGOTIATE_TESTS: true
- job: windows_mingw_amd64 - job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -131,7 +134,8 @@ jobs: ...@@ -131,7 +134,8 @@ jobs:
- job: windows_mingw_x86 - job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -151,7 +155,7 @@ jobs: ...@@ -151,7 +155,7 @@ jobs:
- job: documentation - job: documentation
displayName: 'Generate Documentation' displayName: 'Generate Documentation'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- script: | - script: |
cd $(Build.SourcesDirectory)/azure-pipelines/docker cd $(Build.SourcesDirectory)/azure-pipelines/docker
......
...@@ -5,7 +5,7 @@ jobs: ...@@ -5,7 +5,7 @@ jobs:
- job: coverity - job: coverity
displayName: 'Coverity' displayName: 'Coverity'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- script: | - script: |
cd $(Build.SourcesDirectory)/azure-pipelines/docker cd $(Build.SourcesDirectory)/azure-pipelines/docker
......
...@@ -5,7 +5,7 @@ jobs: ...@@ -5,7 +5,7 @@ jobs:
- job: linux_amd64_xenial_gcc_openssl - job: linux_amd64_xenial_gcc_openssl
displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)' displayName: 'Linux (amd64; Xenial; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -21,7 +21,7 @@ jobs: ...@@ -21,7 +21,7 @@ jobs:
- job: linux_amd64_xenial_gcc_mbedtls - job: linux_amd64_xenial_gcc_mbedtls
displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)' displayName: 'Linux (amd64; Xenial; GCC; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -37,7 +37,7 @@ jobs: ...@@ -37,7 +37,7 @@ jobs:
- job: linux_amd64_xenial_clang_openssl - job: linux_amd64_xenial_clang_openssl
displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)' displayName: 'Linux (amd64; Xenial; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -53,7 +53,7 @@ jobs: ...@@ -53,7 +53,7 @@ jobs:
- job: linux_amd64_xenial_clang_mbedtls - job: linux_amd64_xenial_clang_mbedtls
displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)' displayName: 'Linux (amd64; Xenial; Clang; mbedTLS)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -67,9 +67,9 @@ jobs: ...@@ -67,9 +67,9 @@ jobs:
RUN_INVASIVE_TESTS=true RUN_INVASIVE_TESTS=true
- job: macos - job: macos
displayName: 'macOS' displayName: 'macOS (amd64; 10.15)'
pool: pool:
vmImage: 'macOS 10.13' vmImage: 'macOS-10.15'
steps: steps:
- bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh' - bash: . '$(Build.SourcesDirectory)/azure-pipelines/setup-osx.sh'
displayName: Setup displayName: Setup
...@@ -85,31 +85,34 @@ jobs: ...@@ -85,31 +85,34 @@ jobs:
- job: windows_vs_amd64 - job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)' displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: bash.yml - template: bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 Win64 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
RUN_INVASIVE_TESTS: true RUN_INVASIVE_TESTS: true
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
- job: windows_vs_x86 - job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)' displayName: 'Windows (x86; Visual Studio)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- template: bash.yml - template: bash.yml
parameters: parameters:
environmentVariables: environmentVariables:
CMAKE_GENERATOR: Visual Studio 12 2013 CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
RUN_INVASIVE_TESTS: true RUN_INVASIVE_TESTS: true
SKIP_SSH_TESTS: true SKIP_SSH_TESTS: true
- job: windows_mingw_amd64 - job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)' displayName: 'Windows (amd64; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -127,7 +130,8 @@ jobs: ...@@ -127,7 +130,8 @@ jobs:
- job: windows_mingw_x86 - job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)' displayName: 'Windows (x86; MinGW)'
pool: Hosted pool:
vmImage: 'vs2017-win2016'
steps: steps:
- bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh' - bash: . '$(Build.SourcesDirectory)\azure-pipelines\setup-mingw.sh'
displayName: Setup displayName: Setup
...@@ -147,7 +151,7 @@ jobs: ...@@ -147,7 +151,7 @@ jobs:
- job: linux_x86_bionic_gcc_openssl - job: linux_x86_bionic_gcc_openssl
displayName: 'Linux (x86; Bionic; GCC; OpenSSL)' displayName: 'Linux (x86; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -164,7 +168,7 @@ jobs: ...@@ -164,7 +168,7 @@ jobs:
- job: linux_x86_bionic_clang_openssl - job: linux_x86_bionic_clang_openssl
displayName: 'Linux (x86; Bionic; Clang; OpenSSL)' displayName: 'Linux (x86; Bionic; Clang; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -181,7 +185,7 @@ jobs: ...@@ -181,7 +185,7 @@ jobs:
- job: linux_arm32_bionic_gcc_openssl - job: linux_arm32_bionic_gcc_openssl
displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)' displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
...@@ -199,7 +203,7 @@ jobs: ...@@ -199,7 +203,7 @@ jobs:
- job: linux_arm64_bionic_gcc_openssl - job: linux_arm64_bionic_gcc_openssl
displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)' displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)'
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'ubuntu-18.04'
steps: steps:
- template: docker.yml - template: docker.yml
parameters: parameters:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment