From 6dc2a913666cb46037de2b075910fec7a48ca791 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 21 Jan 2023 11:01:31 +0200 Subject: [PATCH 1/2] [3.7] Bump Azure Pipelines to ubuntu-22.04 (GH-101089). (cherry picked from commit c22a55c8b4f142ff679880ec954691d5920b7845) Co-authored-by: Hugo van Kemenade --- .azure-pipelines/ci.yml | 10 +++++----- .azure-pipelines/pr.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index eaaa88c9634f5c..5bcacb99001dde 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -12,7 +12,7 @@ jobs: displayName: Pre-build checks pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 steps: - template: ./prebuild-checks.yml @@ -24,7 +24,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 steps: - template: ./docs-steps.yml @@ -56,7 +56,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 variables: testRunTitle: '$(build.sourceBranchName)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 7f01f8b25c2cc6..4473e667635b88 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -12,7 +12,7 @@ jobs: displayName: Pre-build checks pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 steps: - template: ./prebuild-checks.yml @@ -24,7 +24,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 steps: - template: ./docs-steps.yml @@ -56,7 +56,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 variables: testRunTitle: '$(system.pullRequest.TargetBranch)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-22.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' From f2cf782638ab83fd5d09098c64b9ef60f838001f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 21 Jan 2023 23:36:55 +0200 Subject: [PATCH 2/2] [3.7] Bump Azure Pipelines to ubuntu-20.04 --- .azure-pipelines/ci.yml | 10 +++++----- .azure-pipelines/pr.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 5bcacb99001dde..3a12fe4bfa4376 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -12,7 +12,7 @@ jobs: displayName: Pre-build checks pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 steps: - template: ./prebuild-checks.yml @@ -24,7 +24,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 steps: - template: ./docs-steps.yml @@ -56,7 +56,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(build.sourceBranchName)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 4473e667635b88..91607b931a360e 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -12,7 +12,7 @@ jobs: displayName: Pre-build checks pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 steps: - template: ./prebuild-checks.yml @@ -24,7 +24,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 steps: - template: ./docs-steps.yml @@ -56,7 +56,7 @@ jobs: condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(system.pullRequest.TargetBranch)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-22.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage'