[7.8] include ci-stats metrics in pr comment (#68563) (#69097)

Spencer · spalger · elasticmachine · web-flow · commit 63c25219f65e · 2020-06-12T18:18:29.000-07:00
Co-authored-by: spalger &lt;spalger@users.noreply.github.com&gt;
Co-authored-by: Elastic Machine &lt;elasticmachine@users.noreply.github.com&gt;
# Conflicts:
#	Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
-  ciStats.trackBuild {
-    githubPr.withDefaultPrComments {
+  githubPr.withDefaultPrComments {
+    ciStats.trackBuild {
       catchError {
         retryable.enable()
         parallel([
@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
         ])
       }
     }
+  }
 
-    if (params.NOTIFY_ON_FAILURE) {
-      slackNotifications.onFailure()
-      kibanaPipeline.sendMail()
-    }
+  if (params.NOTIFY_ON_FAILURE) {
+    slackNotifications.onFailure()
+    kibanaPipeline.sendMail()
   }
 }
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
@@ -186,6 +186,7 @@ def getNextCommentMessage(previousCommentInfo = [:]) {
   }
 
   messages << getTestFailuresMessage()
+  messages << ciStats.getMetricsReport()
 
   if (info.builds && info.builds.size() > 0) {
     messages << getHistoryText(info.builds)

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ library 'kibana-pipeline-library'`
`4`	`4`	`kibanaLibrary.load()`
`5`	`5`
`6`	`6`	`kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {`
`7`		`- ciStats.trackBuild {`
`8`		`- githubPr.withDefaultPrComments {`
	`7`	`+ githubPr.withDefaultPrComments {`
	`8`	`+ ciStats.trackBuild {`
`9`	`9`	`catchError {`
`10`	`10`	`retryable.enable()`
`11`	`11`	`parallel([`
`@@ -53,10 +53,10 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {`
`53`	`53`	`])`
`54`	`54`	`}`
`55`	`55`	`}`
	`56`	`+ }`
`56`	`57`
`57`		`- if (params.NOTIFY_ON_FAILURE) {`
`58`		`- slackNotifications.onFailure()`
`59`		`- kibanaPipeline.sendMail()`
`60`		`- }`
	`58`	`+ if (params.NOTIFY_ON_FAILURE) {`
	`59`	`+ slackNotifications.onFailure()`
	`60`	`+ kibanaPipeline.sendMail()`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ def getNextCommentMessage(previousCommentInfo = [:]) {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`messages << getTestFailuresMessage()`
	`189`	`+ messages << ciStats.getMetricsReport()`
`189`	`190`
`190`	`191`	`if (info.builds && info.builds.size() > 0) {`
`191`	`192`	`messages << getHistoryText(info.builds)`