From 2b05fd922ea2033e1fa139bb4162ed323d11d82a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 8 Jan 2023 17:40:40 +0200 Subject: [PATCH 1/2] 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 eaaa88c9634f5c..3a12fe4bfa4376 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-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-16.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-16.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(build.sourceBranchName)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-20.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 7f01f8b25c2cc6..91607b931a360e 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-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-16.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-16.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(system.pullRequest.TargetBranch)-linux' @@ -82,7 +82,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-20.04 container: manylinux1 @@ -113,7 +113,7 @@ jobs: ) pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-20.04 variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' From 1e114b0f24fe279865e035a49ebedf671360f266 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 8 Jan 2023 19:09:25 +0200 Subject: [PATCH 2/2] Move triggers into YAML files --- .azure-pipelines/ci.yml | 37 +------------------------------------ .azure-pipelines/pr.yml | 37 +------------------------------------ 2 files changed, 2 insertions(+), 72 deletions(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 3a12fe4bfa4376..11b8924e769f17 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -1,11 +1,7 @@ variables: - manylinux: false coverage: false -resources: - containers: - - container: manylinux1 - image: pyca/cryptography-manylinux1:x86_64 +trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7'] jobs: - job: Prebuild @@ -69,37 +65,6 @@ jobs: dependencies: apt -- job: ManyLinux1_CI_Tests - displayName: ManyLinux1 CI Tests - dependsOn: Prebuild - condition: | - and( - and( - succeeded(), - eq(variables['manylinux'], 'true') - ), - eq(dependencies.Prebuild.outputs['tests.run'], 'true') - ) - - pool: - vmImage: ubuntu-20.04 - - container: manylinux1 - - variables: - testRunTitle: '$(build.sourceBranchName)-manylinux1' - testRunPlatform: manylinux1 - openssl_version: '' - - steps: - - template: ./posix-steps.yml - parameters: - dependencies: yum - sudo_dependencies: '' - xvfb: false - patchcheck: false - - - job: Ubuntu_Coverage_CI_Tests displayName: Ubuntu CI Tests (coverage) dependsOn: Prebuild diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 91607b931a360e..4d3593e4a0824e 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -1,11 +1,7 @@ variables: - manylinux: false coverage: false -resources: - containers: - - container: manylinux1 - image: pyca/cryptography-manylinux1:x86_64 +pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7'] jobs: - job: Prebuild @@ -69,37 +65,6 @@ jobs: dependencies: apt -- job: ManyLinux1_PR_Tests - displayName: ManyLinux1 PR Tests - dependsOn: Prebuild - condition: | - and( - and( - succeeded(), - eq(variables['manylinux'], 'true') - ), - eq(dependencies.Prebuild.outputs['tests.run'], 'true') - ) - - pool: - vmImage: ubuntu-20.04 - - container: manylinux1 - - variables: - testRunTitle: '$(system.pullRequest.TargetBranch)-manylinux1' - testRunPlatform: manylinux1 - openssl_version: '' - - steps: - - template: ./posix-steps.yml - parameters: - dependencies: yum - sudo_dependencies: '' - xvfb: false - patchcheck: false - - - job: Ubuntu_Coverage_PR_Tests displayName: Ubuntu PR Tests (coverage) dependsOn: Prebuild