[3.11] gh-109395: Remove skipped coverage job from Azure Pipelines (GH-109412) (...

gh-109395: Remove skipped coverage job from Azure Pipelines (GH-109412)
(cherry picked from commit fa493900fbf19cbfac44164f3d8acb4f598ff3c1)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 63252a76abb69fc7ff8b751f9d0659eaf8ccaa12..ad1576a88fdff7034559078037744c132520ed19 100644 (file)
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -1,6 +1,3 @@
-variables:
-  coverage: false
-
 trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
@@ -51,33 +48,6 @@ jobs:
       dependencies: apt
 
 
-- job: Ubuntu_Coverage_CI_Tests
-  displayName: Ubuntu CI Tests (coverage)
-  dependsOn: Prebuild
-  condition: |
-    and(
-        and(
-            succeeded(),
-            eq(variables['coverage'], 'true')
-        ),
-        eq(dependencies.Prebuild.outputs['tests.run'], 'true')
-    )
-
-  pool:
-    vmImage: ubuntu-22.04
-
-  variables:
-    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
-    testRunPlatform: linux-coverage
-    openssl_version: 1.1.1u
-
-  steps:
-  - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-      coverage: true
-
-
 - 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 29b43e0934472ea149370790e94cdb0b0398a0cf..9b6c30e0e934bf2ab6ab10839ea1f6e54776d833 100644 (file)
--- a/.azure-pipelines/posix-steps.yml
+++ b/.azure-pipelines/posix-steps.yml
@@ -1,5 +1,4 @@
 parameters:
-  coverage: false
   sudo_dependencies: sudo
   dependencies: apt
   patchcheck: true
@@ -23,47 +22,16 @@ steps:
 - script: make -j4
   displayName: 'Build CPython'
 
-- ${{ if eq(parameters.coverage, 'true') }}:
-  - script: ./python -m venv venv && ./venv/bin/python -m pip install -U coverage
-    displayName: 'Set up virtual environment'
+- script: make pythoninfo
+  displayName: 'Display build info'
 
-  - script: ./venv/bin/python -m test.pythoninfo
-    displayName: 'Display build info'
-
-  - script: |
-      $COMMAND -m coverage run --pylib -m test \
-                --fail-env-changed \
-                -uall,-cpu \
-                --junit-xml=$(build.binariesDirectory)/test-results.xml \
-                -x test_multiprocessing_fork \
-                -x test_multiprocessing_forkserver \
-                -x test_multiprocessing_spawn \
-                -x test_concurrent_futures
-    displayName: 'Tests with coverage'
-    env:
-      ${{ if eq(parameters.xvfb, 'true') }}:
-        COMMAND: xvfb-run ./venv/bin/python
-      ${{ if ne(parameters.xvfb, 'true') }}:
-        COMMAND: ./venv/bin/python
-
-  - script: ./venv/bin/python -m coverage xml
-    displayName: 'Generate coverage.xml'
-
-  - script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash) -y .github/codecov.yml
-    displayName: 'Publish code coverage results'
-
-
-- ${{ if ne(parameters.coverage, 'true') }}:
-  - 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
+- 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: |

diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 939c9b4249a3c2e08df61bbb617efd6d98dff6b9..5f052368a469c7fb785e00862f1ac903b520d61a 100644 (file)
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -1,6 +1,3 @@
-variables:
-  coverage: false
-
 pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
 
 jobs:
@@ -53,33 +50,6 @@ jobs:
       dependencies: apt
 
 
-- job: Ubuntu_Coverage_PR_Tests
-  displayName: Ubuntu PR Tests (coverage)
-  dependsOn: Prebuild
-  condition: |
-    and(
-        and(
-            succeeded(),
-            eq(variables['coverage'], 'true')
-        ),
-        eq(dependencies.Prebuild.outputs['tests.run'], 'true')
-    )
-
-  pool:
-    vmImage: ubuntu-22.04
-
-  variables:
-    testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
-    testRunPlatform: linux-coverage
-    openssl_version: 1.1.1u
-
-  steps:
-  - template: ./posix-steps.yml
-    parameters:
-      dependencies: apt
-      coverage: true
-
-
 - job: Windows_PR_Tests
   displayName: Windows PR Tests
   dependsOn: Prebuild