diff options
| author | Mads Jensen <mje@inducks.org> | 2022-01-02 02:22:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-02 02:22:52 +0300 |
| commit | dc66c879283c6c8b27dbcdd5d5faa4fe271e3e8f (patch) | |
| tree | 30a7c0a4b1411ed7b24a4f25a94adaedfacc9a0f /.azure-pipelines | |
| parent | 93c2852fdba34f14b294b38dcd27a0a8d94fe053 (diff) | |
Remove win2016 from Azure devops pipelines. (#9145)
From March 2022, support will be removed.
https://github.com/actions/virtual-environments/issues/4312
Diffstat (limited to '.azure-pipelines')
| -rw-r--r-- | .azure-pipelines/templates/jobs/packaging-jobs.yml | 18 | ||||
| -rw-r--r-- | .azure-pipelines/templates/jobs/standard-tests-jobs.yml | 6 | ||||
| -rw-r--r-- | .azure-pipelines/templates/stages/changelog-stage.yml | 2 |
3 files changed, 12 insertions, 14 deletions
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml index cfd817c8b..c1bba62f5 100644 --- a/.azure-pipelines/templates/jobs/packaging-jobs.yml +++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml @@ -54,8 +54,12 @@ jobs: done displayName: Run integration tests for Docker images - job: installer_build - pool: - vmImage: vs2017-win2016 + strategy: + matrix: + win-2019: + vmImage: windows-2019 + win-2022: + vmImage: windows-2022 steps: - task: UsePythonVersion@0 inputs: @@ -87,17 +91,11 @@ jobs: matrix: win2019: imageName: windows-2019 - win2016: - imageName: vs2017-win2016 + win2022: + imageName: windows-2022 pool: vmImage: $(imageName) steps: - - powershell: | - if ($PSVersionTable.PSVersion.Major -ne 5) { - throw "Powershell version is not 5.x" - } - condition: eq(variables['imageName'], 'vs2017-win2016') - displayName: Check Powershell 5.x is used in vs2017-win2016 - task: UsePythonVersion@0 inputs: versionSpec: 3.9 diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml index 18416fcbb..0aa0e6248 100644 --- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml @@ -13,15 +13,15 @@ jobs: PYTHON_VERSION: 3.10 TOXENV: py310-cover windows-py36: - IMAGE_NAME: vs2017-win2016 + IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.6 TOXENV: py36-win windows-py39-cover: - IMAGE_NAME: vs2017-win2016 + IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.9 TOXENV: py39-cover-win windows-integration-certbot: - IMAGE_NAME: vs2017-win2016 + IMAGE_NAME: windows-2019 PYTHON_VERSION: 3.9 TOXENV: integration-certbot linux-oldest-tests-1: diff --git a/.azure-pipelines/templates/stages/changelog-stage.yml b/.azure-pipelines/templates/stages/changelog-stage.yml index 7d089f8d4..fc8251ac4 100644 --- a/.azure-pipelines/templates/stages/changelog-stage.yml +++ b/.azure-pipelines/templates/stages/changelog-stage.yml @@ -3,7 +3,7 @@ stages: jobs: - job: prepare pool: - vmImage: vs2017-win2016 + vmImage: win2019 steps: # If we change the output filename from `release_notes.md`, it should also be changed in tools/create_github_release.py - bash: | |