summaryrefslogtreecommitdiffstats
path: root/.azure-pipelines
diff options
context:
space:
mode:
authorHugo van Kemenade <hugovk@users.noreply.github.com>2023-09-17 19:24:26 (GMT)
committerGitHub <noreply@github.com>2023-09-17 19:24:26 (GMT)
commite15b663ee1ef8ddeecf82ef11c69b44b3d40d96b (patch)
treeb87a5f381072c941598cadeb03ae067a316c1dfa /.azure-pipelines
parent9b38cbee9004f9f6aaf5974f71b72b1898ba1dd9 (diff)
downloadcpython-e15b663ee1ef8ddeecf82ef11c69b44b3d40d96b.zip
cpython-e15b663ee1ef8ddeecf82ef11c69b44b3d40d96b.tar.gz
cpython-e15b663ee1ef8ddeecf82ef11c69b44b3d40d96b.tar.bz2
[3.11] gh-109408: Remove Ubuntu unit tests from Azure Pipelines (GH-109452) (#109520)
(cherry picked from commit a75daed7e004ee9a53b160307c4c072656176a02)
Diffstat (limited to '.azure-pipelines')
-rw-r--r--.azure-pipelines/ci.yml19
-rw-r--r--.azure-pipelines/posix-steps.yml36
-rw-r--r--.azure-pipelines/pr.yml6
3 files changed, 8 insertions, 53 deletions
diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 246e059..42eb448 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -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
diff --git a/.azure-pipelines/posix-steps.yml b/.azure-pipelines/posix-steps.yml
index 9b6c30e..db44255 100644
--- a/.azure-pipelines/posix-steps.yml
+++ b/.azure-pipelines/posix-steps.yml
@@ -1,9 +1,3 @@
-parameters:
- sudo_dependencies: sudo
- dependencies: apt
- patchcheck: true
- xvfb: true
-
steps:
- checkout: self
clean: true
@@ -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
@@ -25,27 +19,9 @@ 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/scripts/patchcheck.py --ci true
- displayName: 'Run patchcheck.py'
- condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
-
+- script: |
+ git fetch origin
+ ./python Tools/scripts/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()
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 0836c78..3a8728b 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -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'))
@@ -26,8 +26,6 @@ jobs:
steps:
- template: ./posix-steps.yml
- parameters:
- dependencies: apt
- job: Windows_PR_Tests