Pls ignored this patch.

Thanks, Xueliang

On Wed, Dec 30, 2020 at 04:41:51PM +0800, Cao Xueliang wrote:

Signed-off-by: Cao Xueliang caoxl78320@163.com

lib/mail_bisect_result.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 5f88c36..4883072 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -3,6 +3,7 @@ require 'json' require 'base64' require_relative 'git' +require_relative 'es_query' require_relative 'mail_client' require_relative 'assign_account_client'

@@ -28,9 +29,9 @@ class MailBisectResult def compose_mail subject = "[Compass-CI][#{@repo.split('/')[1]}] #{@commit_id[0..9]} #{@bisect_error[0].split("\n")[0]}" prefix_srv = "http://#%7BENV%5B%27SRV_HTTP_HOST%27%5D%7D:#%7BENV%5B%27SRV_HTTP_PORT%27%5D%..."

• bisect_job_url = ENV['result_root'] ? "bisect job info: #{prefix_srv}#{ENV['result_root']}\n" : ''
• pkgbuild_repo_url = "PKGBUILD info: #{prefix_srv}/#{@pkgbuild_repo}\n"
• first_bad_commit_job_url = "first bad commit job info: #{prefix_srv}#{@first_bad_commit_result_root}\n"

• bisect_job_url = ENV['result_root'] ? "bisect job result directory: #{prefix_srv}#{ENV['result_root']}\n" : ''

• pkgbuild_repo_url = "PKGBUILD file directory: #{prefix_srv}/#{@pkgbuild_repo}\n"

• first_bad_commit_job_url = "first bad commit job result directory: #{prefix_srv}#{@first_bad_commit_result_root}\n"

  data = <<~BODY To: #{@to}

@@ -46,9 +47,9 @@ class MailBisectResult #{@all_errors}

reference information:

• #{first_bad_commit_job_url} #{pkgbuild_repo_url} #{bisect_job_url}

• #{first_bad_commit_job_url} Regards, Compass CI team BODY

@@ -67,6 +68,9 @@ class MailBisectResult 'my_commit_url' => "#{@git_commit.url}/commit/#{@commit_id}" }

• account_info = ESQuery.new(index: 'accounts').query_by_id(@to)
• return if account_info
• apply_account = AutoAssignAccount.new(user_info) apply_account.send_account end

-- 2.23.0