Skip to content
Merged
Changes from 1 commit
Commits
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
9 changes: 5 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ VERSION=${env.VERSION}-SNAPSHOT""")
dir("${BASE_DIR}"){
notifyBuildResult(prComment: true,
slackComment: true, slackNotify: (isBranch() || isTag()),
analyzeFlakey: !isTag(), flakyReportIdx: "reporter-beats-beats-${getIdSuffix()}")
analyzeFlakey: !isTag(), jobName: "${getFlakyJobName()}")
}
}
}
Expand All @@ -166,12 +166,13 @@ VERSION=${env.VERSION}-SNAPSHOT""")
/**
* There are only two supported branches, master and 7.x
*/
def getIdSuffix() {
def getFlakyJobName() {
def parent = env.JOB_NAME.replaceAll(env.JOB_BASE_NAME + '$', '')
if(isPR()) {
return getBranchIndice(env.CHANGE_TARGET)
return parent + getBranchIndice(env.CHANGE_TARGET)
}
if(isBranch()) {
return getBranchIndice(env.BRANCH_NAME)
return parent + getBranchIndice(env.BRANCH_NAME)
}
}

Expand Down