Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Correct PR branch detection in code coverage #12615

Merged
merged 5 commits into from
Sep 21, 2018
Merged

Correct PR branch detection in code coverage #12615

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c8956a
Correct PR branch detection in code coverage
marcoabreu Sep 20, 2018
d724c8c
Always use latest commit
marcoabreu Sep 20, 2018
4320d32
Add merge commit detection
marcoabreu Sep 20, 2018
64f55cf
Add debug output
marcoabreu Sep 21, 2018
0ed6a10
Remove debug output
marcoabreu Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ci/Jenkinsfile_utils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} "
}
Expand Down