Skip to content

Commit 1ecbfbc

Browse files
Update Azure Pipelines build to use Ubuntu 18.04 and move triggers into YAML files (GH-21776)
(cherry picked from commit 102b498) Co-authored-by: Steve Dower <steve.dower@python.org>
1 parent 5e12a5b commit 1ecbfbc

File tree

2 files changed

+10
-80
lines changed

2 files changed

+10
-80
lines changed

.azure-pipelines/ci.yml

+5-40
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
variables:
2-
manylinux: false
32
coverage: false
43

5-
resources:
6-
containers:
7-
- container: manylinux1
8-
image: pyca/cryptography-manylinux1:x86_64
4+
trigger: ['master', '3.9', '3.8', '3.7']
95

106
jobs:
117
- job: Prebuild
128
displayName: Pre-build checks
139

1410
pool:
15-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-18.04
1612

1713
steps:
1814
- template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
2420
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2521

2622
pool:
27-
vmImage: ubuntu-16.04
23+
vmImage: ubuntu-18.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -56,7 +52,7 @@ jobs:
5652
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5753

5854
pool:
59-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-18.04
6056

6157
variables:
6258
testRunTitle: '$(build.sourceBranchName)-linux'
@@ -69,37 +65,6 @@ jobs:
6965
dependencies: apt
7066

7167

72-
- job: ManyLinux1_CI_Tests
73-
displayName: ManyLinux1 CI Tests
74-
dependsOn: Prebuild
75-
condition: |
76-
and(
77-
and(
78-
succeeded(),
79-
eq(variables['manylinux'], 'true')
80-
),
81-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
82-
)
83-
84-
pool:
85-
vmImage: ubuntu-16.04
86-
87-
container: manylinux1
88-
89-
variables:
90-
testRunTitle: '$(build.sourceBranchName)-manylinux1'
91-
testRunPlatform: manylinux1
92-
openssl_version: ''
93-
94-
steps:
95-
- template: ./posix-steps.yml
96-
parameters:
97-
dependencies: yum
98-
sudo_dependencies: ''
99-
xvfb: false
100-
patchcheck: false
101-
102-
10368
- job: Ubuntu_Coverage_CI_Tests
10469
displayName: Ubuntu CI Tests (coverage)
10570
dependsOn: Prebuild
@@ -113,7 +78,7 @@ jobs:
11378
)
11479
11580
pool:
116-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-18.04
11782

11883
variables:
11984
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'

.azure-pipelines/pr.yml

+5-40
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
variables:
2-
manylinux: false
32
coverage: false
43

5-
resources:
6-
containers:
7-
- container: manylinux1
8-
image: pyca/cryptography-manylinux1:x86_64
4+
pr: ['master', '3.9', '3.8', '3.7']
95

106
jobs:
117
- job: Prebuild
128
displayName: Pre-build checks
139

1410
pool:
15-
vmImage: ubuntu-16.04
11+
vmImage: ubuntu-18.04
1612

1713
steps:
1814
- template: ./prebuild-checks.yml
@@ -24,7 +20,7 @@ jobs:
2420
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2521

2622
pool:
27-
vmImage: ubuntu-16.04
23+
vmImage: ubuntu-18.04
2824

2925
steps:
3026
- template: ./docs-steps.yml
@@ -56,7 +52,7 @@ jobs:
5652
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5753

5854
pool:
59-
vmImage: ubuntu-16.04
55+
vmImage: ubuntu-18.04
6056

6157
variables:
6258
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
@@ -69,37 +65,6 @@ jobs:
6965
dependencies: apt
7066

7167

72-
- job: ManyLinux1_PR_Tests
73-
displayName: ManyLinux1 PR Tests
74-
dependsOn: Prebuild
75-
condition: |
76-
and(
77-
and(
78-
succeeded(),
79-
eq(variables['manylinux'], 'true')
80-
),
81-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
82-
)
83-
84-
pool:
85-
vmImage: ubuntu-16.04
86-
87-
container: manylinux1
88-
89-
variables:
90-
testRunTitle: '$(system.pullRequest.TargetBranch)-manylinux1'
91-
testRunPlatform: manylinux1
92-
openssl_version: ''
93-
94-
steps:
95-
- template: ./posix-steps.yml
96-
parameters:
97-
dependencies: yum
98-
sudo_dependencies: ''
99-
xvfb: false
100-
patchcheck: false
101-
102-
10368
- job: Ubuntu_Coverage_PR_Tests
10469
displayName: Ubuntu PR Tests (coverage)
10570
dependsOn: Prebuild
@@ -113,7 +78,7 @@ jobs:
11378
)
11479
11580
pool:
116-
vmImage: ubuntu-16.04
81+
vmImage: ubuntu-18.04
11782

11883
variables:
11984
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'

0 commit comments

Comments
 (0)