Skip to content

Commit 5c439fb

Browse files
[3.12] gh-109408: Remove Ubuntu unit tests from Azure Pipelines (GH-109452) (#109519)
gh-109408: Remove Ubuntu unit tests from Azure Pipelines (GH-109452) (cherry picked from commit a75daed) Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent cc12f66 commit 5c439fb

File tree

3 files changed

+8
-54
lines changed

3 files changed

+8
-54
lines changed

.azure-pipelines/ci.yml

-19
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,6 @@ jobs:
1111
- template: ./prebuild-checks.yml
1212

1313

14-
- job: Ubuntu_CI_Tests
15-
displayName: Ubuntu CI Tests
16-
dependsOn: Prebuild
17-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
18-
19-
pool:
20-
vmImage: ubuntu-22.04
21-
22-
variables:
23-
testRunTitle: '$(build.sourceBranchName)-linux'
24-
testRunPlatform: linux
25-
openssl_version: 1.1.1u
26-
27-
steps:
28-
- template: ./posix-steps.yml
29-
parameters:
30-
dependencies: apt
31-
32-
3314
- job: Windows_CI_Tests
3415
displayName: Windows CI Tests
3516
dependsOn: Prebuild

.azure-pipelines/posix-steps.yml

+6-31
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
parameters:
2-
sudo_dependencies: sudo
3-
dependencies: apt
4-
patchcheck: true
5-
xvfb: true
6-
71
steps:
82
- checkout: self
93
clean: true
@@ -13,7 +7,7 @@ steps:
137
- script: sudo setfacl -Rb /home/vsts
148
displayName: 'Workaround ACL issue'
159

16-
- script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
10+
- script: sudo ./.azure-pipelines/posix-deps-apt.sh $(openssl_version)
1711
displayName: 'Install dependencies'
1812

1913
- script: ./configure --with-pydebug
@@ -25,27 +19,8 @@ steps:
2519
- script: make pythoninfo
2620
displayName: 'Display build info'
2721

28-
- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
29-
displayName: 'Tests'
30-
env:
31-
${{ if eq(parameters.xvfb, 'true') }}:
32-
COMMAND: xvfb-run make
33-
${{ if ne(parameters.xvfb, 'true') }}:
34-
COMMAND: make
35-
36-
- ${{ if eq(parameters.patchcheck, 'true') }}:
37-
- script: |
38-
git fetch origin
39-
./python Tools/patchcheck/patchcheck.py --ci true
40-
displayName: 'Run patchcheck.py'
41-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
42-
43-
44-
- task: PublishTestResults@2
45-
displayName: 'Publish Test Results'
46-
inputs:
47-
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
48-
mergeTestResults: true
49-
testRunTitle: $(testRunTitle)
50-
platform: $(testRunPlatform)
51-
condition: succeededOrFailed()
22+
- script: |
23+
git fetch origin
24+
./python Tools/patchcheck/patchcheck.py --ci true
25+
displayName: 'Run patchcheck.py'
26+
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

.azure-pipelines/pr.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
- template: ./prebuild-checks.yml
1212

1313

14-
- job: Ubuntu_PR_Tests
15-
displayName: Ubuntu PR Tests
14+
- job: Ubuntu_Patchcheck
15+
displayName: Ubuntu patchcheck
1616
dependsOn: Prebuild
1717
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
1818

@@ -26,8 +26,6 @@ jobs:
2626

2727
steps:
2828
- template: ./posix-steps.yml
29-
parameters:
30-
dependencies: apt
3129

3230

3331
- job: Windows_PR_Tests

0 commit comments

Comments
 (0)