[7.5] Add kibanamachine support to Github PR comments (#53852) (#53872)

brianseeders · web-flow · commit 7cf3e9418c5e · 2019-12-31T21:42:23.000-05:00
* Add kibanamachine support to Github PR comments * Temporary commit for quick successful pipeline * Only delete the last comment if it was made by kibanamachine * Revert "Temporary commit for quick successful pipeline" This reverts commit d31f579.
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
@@ -35,7 +35,7 @@ def withDefaultPrComments(closure) {
     def message = getNextCommentMessage(info)
     postComment(message)
 
-    if (lastComment) {
+    if (lastComment && lastComment.user.login == 'kibanamachine') {
       deleteComment(lastComment.id)
     }
   }
@@ -49,7 +49,7 @@ def isPr() {
 def getLatestBuildComment() {
   return getComments()
     .reverse()
-    .find { it.user.login == 'elasticmachine' && it.body =~ /<!--PIPELINE/ }
+    .find { (it.user.login == 'elasticmachine' || it.user.login == 'kibanamachine') && it.body =~ /<!--PIPELINE/ }
 }
 
 def getBuildInfoFromComment(commentText) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ def withDefaultPrComments(closure) {`
`35`	`35`	`def message = getNextCommentMessage(info)`
`36`	`36`	`postComment(message)`
`37`	`37`
`38`		`- if (lastComment) {`
	`38`	`+ if (lastComment && lastComment.user.login == 'kibanamachine') {`
`39`	`39`	`deleteComment(lastComment.id)`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -49,7 +49,7 @@ def isPr() {`
`49`	`49`	`def getLatestBuildComment() {`
`50`	`50`	`return getComments()`
`51`	`51`	`.reverse()`
`52`		`- .find { it.user.login == 'elasticmachine' && it.body =~ /<!--PIPELINE/ }`
	`52`	`+ .find { (it.user.login == 'elasticmachine' \|\| it.user.login == 'kibanamachine') && it.body =~ /<!--PIPELINE/ }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`def getBuildInfoFromComment(commentText) {`