Update Azure Pipelines build to use Ubuntu 18.04 and move triggers into YAML files (GH-21776)

This commit is contained in:
Steve Dower 2020-08-07 23:22:02 +01:00 committed by GitHub
parent fcce8c649a
commit 102b4988b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 80 deletions

View File

@ -1,18 +1,14 @@
variables: variables:
manylinux: false
coverage: false coverage: false
resources: trigger: ['master', '3.9', '3.8', '3.7']
containers:
- container: manylinux1
image: pyca/cryptography-manylinux1:x86_64
jobs: jobs:
- job: Prebuild - job: Prebuild
displayName: Pre-build checks displayName: Pre-build checks
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
steps: steps:
- template: ./prebuild-checks.yml - template: ./prebuild-checks.yml
@ -24,7 +20,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
steps: steps:
- template: ./docs-steps.yml - template: ./docs-steps.yml
@ -56,7 +52,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
variables: variables:
testRunTitle: '$(build.sourceBranchName)-linux' testRunTitle: '$(build.sourceBranchName)-linux'
@ -69,37 +65,6 @@ jobs:
dependencies: apt 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-16.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 - job: Ubuntu_Coverage_CI_Tests
displayName: Ubuntu CI Tests (coverage) displayName: Ubuntu CI Tests (coverage)
dependsOn: Prebuild dependsOn: Prebuild
@ -113,7 +78,7 @@ jobs:
) )
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
variables: variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunTitle: '$(Build.SourceBranchName)-linux-coverage'

View File

@ -1,18 +1,14 @@
variables: variables:
manylinux: false
coverage: false coverage: false
resources: pr: ['master', '3.9', '3.8', '3.7']
containers:
- container: manylinux1
image: pyca/cryptography-manylinux1:x86_64
jobs: jobs:
- job: Prebuild - job: Prebuild
displayName: Pre-build checks displayName: Pre-build checks
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
steps: steps:
- template: ./prebuild-checks.yml - template: ./prebuild-checks.yml
@ -24,7 +20,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
steps: steps:
- template: ./docs-steps.yml - template: ./docs-steps.yml
@ -56,7 +52,7 @@ jobs:
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true')) condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
variables: variables:
testRunTitle: '$(system.pullRequest.TargetBranch)-linux' testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
@ -69,37 +65,6 @@ jobs:
dependencies: apt 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-16.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 - job: Ubuntu_Coverage_PR_Tests
displayName: Ubuntu PR Tests (coverage) displayName: Ubuntu PR Tests (coverage)
dependsOn: Prebuild dependsOn: Prebuild
@ -113,7 +78,7 @@ jobs:
) )
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-18.04
variables: variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunTitle: '$(Build.SourceBranchName)-linux-coverage'