Merge pull request #21253 from cpennington/coverage-combine-test-suite

Archive all coverage reports, named by test context

pavelib/utils/test/utils.py

@@ -186,6 +186,6 @@ def fetch_coverage_test_selection_data(options):
 def upload_coverage_to_s3():
     upload_to_s3(
         COVERAGE_CACHE_BASELINE,
-        '{}/{}'.format(COVERAGE_CACHE_BASEPATH, 'reports/{}.coverage'.format(os.environ.get('TEST_SUITE'))),
+        '{}/{}'.format(COVERAGE_CACHE_BASEPATH, 'reports/{}.coverage'.format(os.environ.get('TEST_SUITE', ''))),
         COVERAGE_CACHE_BUCKET
     )

scripts/Jenkinsfiles/bokchoy

@@ -104,6 +104,13 @@ pipeline {
                     }
                 }
             }
+            post {
+                always {
+                    script {
+                        archiveArtifacts allowEmptyArchive: true, artifacts: 'reports/*.coverage'
+                    }
+                }
+            }
         }
     }
     post {

scripts/Jenkinsfiles/python

@@ -175,7 +175,7 @@ pipeline {
             post {
                 always {
                     script {
-                        archiveArtifacts allowEmptyArchive: true, artifacts: 'reports/${TEST_SUITE}.coverage'
+                        archiveArtifacts allowEmptyArchive: true, artifacts: 'reports/*.coverage'
                         publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true,
                             reportDir: 'reports/cover', reportFiles: 'index.html',
                             reportName: 'Coverage.py Report', reportTitles: ''])