Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 28f6cb3

Browse filesBrowse files
zoobazooba
authored
bpo-35683: Improve Azure Pipelines steps (GH-11493)
1 parent bf4ac2d commit 28f6cb3
Copy full SHA for 28f6cb3

File tree

Expand file treeCollapse file tree

13 files changed

+148
-166
lines changed
Filter options
Expand file treeCollapse file tree

13 files changed

+148
-166
lines changed

‎.azure-pipelines/ci.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/ci.yml
+20-4Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ variables:
22
manylinux: false
33
coverage: false
44

5+
resources:
6+
containers:
7+
- container: manylinux1
8+
image: pyca/cryptography-manylinux1:x86_64
9+
510
jobs:
611
- job: Prebuild
712
displayName: Pre-build checks
@@ -54,10 +59,12 @@ jobs:
5459
variables:
5560
testRunTitle: '$(build.sourceBranchName)-linux'
5661
testRunPlatform: linux
57-
openssl_version: 1.1.0g
62+
openssl_version: 1.1.0j
5863

5964
steps:
6065
- template: ./posix-steps.yml
66+
parameters:
67+
dependencies: apt
6168

6269

6370
- job: ManyLinux1_CI_Tests
@@ -75,13 +82,20 @@ jobs:
7582
pool:
7683
vmImage: ubuntu-16.04
7784

85+
container: manylinux1
86+
7887
variables:
7988
testRunTitle: '$(build.sourceBranchName)-manylinux1'
8089
testRunPlatform: manylinux1
81-
imageName: 'dockcross/manylinux-x64'
90+
openssl_version: ''
8291

8392
steps:
84-
- template: ./docker-steps.yml
93+
- template: ./posix-steps.yml
94+
parameters:
95+
dependencies: yum
96+
sudo_dependencies: ''
97+
xvfb: false
98+
patchcheck: false
8599

86100

87101
- job: Ubuntu_Coverage_CI_Tests
@@ -102,11 +116,12 @@ jobs:
102116
variables:
103117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
104118
testRunPlatform: linux-coverage
105-
openssl_version: 1.1.0g
119+
openssl_version: 1.1.0j
106120

107121
steps:
108122
- template: ./posix-steps.yml
109123
parameters:
124+
dependencies: apt
110125
coverage: true
111126

112127

@@ -144,3 +159,4 @@ jobs:
144159
- template: ./windows-layout-steps.yml
145160
parameters:
146161
kind: appx
162+
fulltest: true

‎.azure-pipelines/docker-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/docker-steps.yml
-76Lines changed: 0 additions & 76 deletions
This file was deleted.

‎.azure-pipelines/posix-deps.sh renamed to ‎.azure-pipelines/posix-deps-apt.sh

Copy file name to clipboardExpand all lines: .azure-pipelines/posix-deps-apt.sh
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
sudo apt-get update
1+
apt-get update
22

3-
sudo apt-get -yq install \
3+
apt-get -yq install \
44
build-essential \
55
zlib1g-dev \
66
libbz2-dev \

‎.azure-pipelines/posix-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/posix-steps.yml
+22-8Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
parameters:
22
coverage: false
3+
sudo_dependencies: sudo
4+
dependencies: apt
5+
patchcheck: true
6+
xvfb: true
37

48
steps:
59
- checkout: self
610
clean: true
711
fetchDepth: 5
812

9-
- script: ./.azure-pipelines/posix-deps.sh $(openssl_version)
13+
- script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
1014
displayName: 'Install dependencies'
1115

1216
- script: ./configure --with-pydebug
@@ -23,7 +27,7 @@ steps:
2327
displayName: 'Display build info'
2428

2529
- script: |
26-
xvfb-run ./venv/bin/python -m coverage run --pylib -m test \
30+
$COMMAND -m coverage run --pylib -m test \
2731
--fail-env-changed \
2832
-uall,-cpu \
2933
--junit-xml=$(build.binariesDirectory)/test-results.xml \
@@ -32,6 +36,11 @@ steps:
3236
-x test_multiprocessing_spawn \
3337
-x test_concurrent_futures
3438
displayName: 'Tests with coverage'
39+
env:
40+
${{ if eq(parameters.xvfb, 'true') }}:
41+
COMMAND: xvfb-run ./venv/bin/python
42+
${{ if ne(parameters.xvfb, 'true') }}:
43+
COMMAND: ./venv/bin/python
3544
3645
- script: ./venv/bin/python -m coverage xml
3746
displayName: 'Generate coverage.xml'
@@ -44,13 +53,18 @@ steps:
4453
- script: make pythoninfo
4554
displayName: 'Display build info'
4655

47-
- script: xvfb-run make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
56+
- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
4857
displayName: 'Tests'
49-
50-
51-
- script: ./python Tools/scripts/patchcheck.py --travis true
52-
displayName: 'Run patchcheck.py'
53-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
58+
env:
59+
${{ if eq(parameters.xvfb, 'true') }}:
60+
COMMAND: xvfb-run make
61+
${{ if ne(parameters.xvfb, 'true') }}:
62+
COMMAND: make
63+
64+
- ${{ if eq(parameters.patchcheck, 'true') }}:
65+
- script: ./python Tools/scripts/patchcheck.py --travis true
66+
displayName: 'Run patchcheck.py'
67+
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
5468

5569

5670
- task: PublishTestResults@2

‎.azure-pipelines/pr.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/pr.yml
+69-2Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
variables:
2+
manylinux: false
3+
coverage: false
4+
5+
resources:
6+
containers:
7+
- container: manylinux1
8+
image: pyca/cryptography-manylinux1:x86_64
9+
110
jobs:
211
- job: Prebuild
312
displayName: Pre-build checks
@@ -50,12 +59,70 @@ jobs:
5059
variables:
5160
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5261
testRunPlatform: linux
53-
openssl_version: 1.1.0g
62+
openssl_version: 1.1.0j
5463

5564
steps:
5665
- template: ./posix-steps.yml
5766
parameters:
58-
targetBranch: $(System.PullRequest.TargetBranch)
67+
dependencies: apt
68+
69+
70+
- job: ManyLinux1_PR_Tests
71+
displayName: ManyLinux1 PR Tests
72+
dependsOn: Prebuild
73+
condition: |
74+
and(
75+
and(
76+
succeeded(),
77+
eq(variables['manylinux'], 'true')
78+
),
79+
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
80+
)
81+
82+
pool:
83+
vmImage: ubuntu-16.04
84+
85+
container: manylinux1
86+
87+
variables:
88+
testRunTitle: '$(system.pullRequest.TargetBranch)-manylinux1'
89+
testRunPlatform: manylinux1
90+
openssl_version: ''
91+
92+
steps:
93+
- template: ./posix-steps.yml
94+
parameters:
95+
dependencies: yum
96+
sudo_dependencies: ''
97+
xvfb: false
98+
patchcheck: false
99+
100+
101+
- job: Ubuntu_Coverage_PR_Tests
102+
displayName: Ubuntu PR Tests (coverage)
103+
dependsOn: Prebuild
104+
condition: |
105+
and(
106+
and(
107+
succeeded(),
108+
eq(variables['coverage'], 'true')
109+
),
110+
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
111+
)
112+
113+
pool:
114+
vmImage: ubuntu-16.04
115+
116+
variables:
117+
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118+
testRunPlatform: linux-coverage
119+
openssl_version: 1.1.0j
120+
121+
steps:
122+
- template: ./posix-steps.yml
123+
parameters:
124+
dependencies: apt
125+
coverage: true
59126

60127

61128
- job: Windows_PR_Tests

‎.azure-pipelines/windows-appx-test.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/windows-appx-test.yml
-67Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.