From 077abb13c54b8f0461fa3361c673cd01602b438f Mon Sep 17 00:00:00 2001 From: Marco de Abreu Date: Fri, 21 Sep 2018 11:07:11 +0200 Subject: [PATCH] Add debug output --- Jenkinsfile | 1 + ci/Jenkinsfile_utils.groovy | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bc033aaa117d..11bbe2293e95 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,6 +103,7 @@ core_logic: { node(NODE_LINUX_CPU) { ws('workspace/sanity-lint') { utils.init_git() + utils.publish_test_coverage() utils.docker_run('ubuntu_cpu', 'sanity_check', false) } } diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy index 79c521c715e6..49483d7bf9b2 100644 --- a/ci/Jenkinsfile_utils.groovy +++ b/ci/Jenkinsfile_utils.groovy @@ -78,6 +78,9 @@ 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 lastCommitMessage = sh (script: "git log -1 --pretty=%B", returnStdout: true) + echo lastCommitMessage + echo String.valueOf(lastCommitMessage.startsWith("Merge commit '")) + echo String.valueOf(lastCommitMessage.endsWith("' into HEAD")) if (lastCommitMessage.startsWith("Merge commit '") && lastCommitMessage.endsWith("' into HEAD")) { // Merge commit applied by Jenkins, skip that commit GIT_COMMIT_HASH = sh (script: "git rev-parse @~", returnStdout: true)