diff options
| author | Adrien Ferrand <adferrand@users.noreply.github.com> | 2022-01-04 12:24:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 12:24:24 +0300 |
| commit | 97a09dee19273a6c43aa71edc04ecfae3e761314 (patch) | |
| tree | c8f0c6a2920024b1bcd941444f007c1aaa75c10e | |
| parent | a0dbe1e85035f12e194d91148836d830871ec554 (diff) | |
Revert "Remove win2016 from Azure devops pipelines. (#9145)" (#9158)
This reverts commit dc66c879283c6c8b27dbcdd5d5faa4fe271e3e8f.
| -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, 14 insertions, 12 deletions
diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml index c1bba62f5..cfd817c8b 100644 --- a/.azure-pipelines/templates/jobs/packaging-jobs.yml +++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml @@ -54,12 +54,8 @@ jobs: done displayName: Run integration tests for Docker images - job: installer_build - strategy: - matrix: - win-2019: - vmImage: windows-2019 - win-2022: - vmImage: windows-2022 + pool: + vmImage: vs2017-win2016 steps: - task: UsePythonVersion@0 inputs: @@ -91,11 +87,17 @@ jobs: matrix: win2019: imageName: windows-2019 - win2022: - imageName: windows-2022 + win2016: + imageName: vs2017-win2016 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 0aa0e6248..18416fcbb 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: windows-2019 + IMAGE_NAME: vs2017-win2016 PYTHON_VERSION: 3.6 TOXENV: py36-win windows-py39-cover: - IMAGE_NAME: windows-2019 + IMAGE_NAME: vs2017-win2016 PYTHON_VERSION: 3.9 TOXENV: py39-cover-win windows-integration-certbot: - IMAGE_NAME: windows-2019 + IMAGE_NAME: vs2017-win2016 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 fc8251ac4..7d089f8d4 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: win2019 + vmImage: vs2017-win2016 steps: # If we change the output filename from `release_notes.md`, it should also be changed in tools/create_github_release.py - bash: | |