[GitHub] marcoabreu closed pull request #12616: [Test] Fix testcoverage report

[GitBox <gi...@apache.org>]

marcoabreu closed pull request #12616: [Test] Fix testcoverage report
URL: https://github.com/apache/incubator-mxnet/pull/12616
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy
index ca5f234a2c5..558548b932b 100644
--- a/ci/Jenkinsfile_utils.groovy
+++ b/ci/Jenkinsfile_utils.groovy
@@ -78,16 +78,14 @@ echo ${libs} | sed -e 's/,/ /g' | xargs md5sum
 def publish_test_coverage() {
     // CodeCovs auto detection has trouble with our CIs PR validation due the merging strategy
     def codecovArgs = ""
-    if (env.CHANGE_ID != '') {
+    GIT_COMMIT_HASH = sh (script: "git rev-parse @", returnStdout: true)
+    if (env.CHANGE_ID) {
       // PR execution
-      // Take the previous commit because of our PR merge strategy that adds a temporary commit for CI
-      GIT_COMMIT_HASH = sh (script: "git rev-parse @~", returnStdout: true)
       codecovArgs += "-B ${env.CHANGE_TARGET} " +
         "-C ${GIT_COMMIT_HASH} " +
         "-P ${env.CHANGE_ID} "
     } else {
       // Branch execution
-      GIT_COMMIT_HASH = sh (script: "git rev-parse @", returnStdout: true)
       codecovArgs += "-B ${env.BRANCH_NAME} " +
         "-C ${GIT_COMMIT_HASH} "
     }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services