[CI] Don't do CI stats reporting/failures for feature branch PRs (#99668

) (#99690) Co-authored-by: Brian Seeders <[email protected]>
elastic · May 10, 2021 · 761dc11 · 761dc11
1 parent a574539
commit 761dc11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,7 +6,7 @@ kibanaLibrary.load()
 kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
   slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
     githubPr.withDefaultPrComments {
-      ciStats.trackBuild(requireSuccess: githubPr.isPr()) {
+      ciStats.trackBuild(requireSuccess: githubPr.isTrackedBranchPr()) {
         catchError {
           retryable.enable()
           kibanaPipeline.allCiTasks()

diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
@@ -64,6 +64,10 @@ def isPr() {
   return !!(env.ghprbPullId && env.ghprbPullLink && env.ghprbPullLink =~ /\/elastic\/kibana\//)
 }
 
+def isTrackedBranchPr() {
+  return isPr() && (env.ghprbTargetBranch == 'master' || env.ghprbTargetBranch == '6.8' || env.ghprbTargetBranch =~ /[7-8]\.[x0-9]+/)
+}
+
 def getLatestBuildComment() {
   return getComments()
     .reverse()
@@ -234,8 +238,10 @@ def getNextCommentMessage(previousCommentInfo = [:], isFinal = false) {
 
   messages << getTestFailuresMessage()
 
-  if (isFinal) {
-    messages << ciStats.getMetricsReport()
+  catchErrors {
+    if (isFinal && isTrackedBranchPr()) {
+      messages << ciStats.getMetricsReport()
+    }
   }
 
   if (info.builds && info.builds.size() > 0) {