Skip to content

Commit

Permalink
[3.12] gh-109408: Remove Ubuntu unit tests from Azure Pipelines (GH-1…
Browse files Browse the repository at this point in the history
…09452) (#109519)

gh-109408: Remove Ubuntu unit tests from Azure Pipelines (GH-109452)
(cherry picked from commit a75daed)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
  • Loading branch information
miss-islington and hugovk committed Sep 17, 2023
1 parent cc12f66 commit 5c439fb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 54 deletions.
19 changes: 0 additions & 19 deletions .azure-pipelines/ci.yml
Expand Up @@ -11,25 +11,6 @@ jobs:
- template: ./prebuild-checks.yml


- job: Ubuntu_CI_Tests
displayName: Ubuntu CI Tests
dependsOn: Prebuild
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))

pool:
vmImage: ubuntu-22.04

variables:
testRunTitle: '$(build.sourceBranchName)-linux'
testRunPlatform: linux
openssl_version: 1.1.1u

steps:
- template: ./posix-steps.yml
parameters:
dependencies: apt


- job: Windows_CI_Tests
displayName: Windows CI Tests
dependsOn: Prebuild
Expand Down
37 changes: 6 additions & 31 deletions .azure-pipelines/posix-steps.yml
@@ -1,9 +1,3 @@
parameters:
sudo_dependencies: sudo
dependencies: apt
patchcheck: true
xvfb: true

steps:
- checkout: self
clean: true
Expand All @@ -13,7 +7,7 @@ steps:
- script: sudo setfacl -Rb /home/vsts
displayName: 'Workaround ACL issue'

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

- script: ./configure --with-pydebug
Expand All @@ -25,27 +19,8 @@ steps:
- script: make pythoninfo
displayName: 'Display build info'

- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
displayName: 'Tests'
env:
${{ if eq(parameters.xvfb, 'true') }}:
COMMAND: xvfb-run make
${{ if ne(parameters.xvfb, 'true') }}:
COMMAND: make

- ${{ if eq(parameters.patchcheck, 'true') }}:
- script: |
git fetch origin
./python Tools/patchcheck/patchcheck.py --ci true
displayName: 'Run patchcheck.py'
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
- task: PublishTestResults@2
displayName: 'Publish Test Results'
inputs:
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
mergeTestResults: true
testRunTitle: $(testRunTitle)
platform: $(testRunPlatform)
condition: succeededOrFailed()
- script: |
git fetch origin
./python Tools/patchcheck/patchcheck.py --ci true
displayName: 'Run patchcheck.py'
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
6 changes: 2 additions & 4 deletions .azure-pipelines/pr.yml
Expand Up @@ -11,8 +11,8 @@ jobs:
- template: ./prebuild-checks.yml


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

Expand All @@ -26,8 +26,6 @@ jobs:

steps:
- template: ./posix-steps.yml
parameters:
dependencies: apt


- job: Windows_PR_Tests
Expand Down

0 comments on commit 5c439fb

Please sign in to comment.