[Compass-ci] Re: [PATCH compass-ci] lib/bisect: add PKGBUILD info in bisect report

Ignored this patch.

Thanks, Xueliang

On Mon, Dec 28, 2020 at 11:25:18PM +0800, Cao Xueliang wrote:

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

lib/git_bisect.rb | 7 +++++++ lib/mail_bisect_result.rb | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index f789a71..2043730 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -22,6 +22,7 @@ class GitBisect set_bad_job set_build_pkg_dir set_upstream

• set_pkgbuild_repo set_work_dir set_bad_commit set_good_commit

@@ -61,6 +62,11 @@ class GitBisect raise "checkout repo: #{@upstream_repo} to commit: #{@upstream_commit} failed!" unless @work_dir end

• def set_pkgbuild_repo
• @pkgbuild_repo = @bad_job['pkgbuild_repo']
• raise 'pkgbuild_repo is null' unless @pkgbuild_repo
• end
• def set_bad_commit @bad_commit = @upstream_commit end

@@ -100,6 +106,7 @@ class GitBisect 'commit' => first_bad_commit, 'bisect_error' => bisect_error, 'all_errors' => all_errors,

•            'pkgbuild_repo' => @pkgbuild_repo,
            'first_bad_commit_result_root' => first_bad_commit_result_root]
  

  end

diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 1d4ed69..2d2e855 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -9,10 +9,11 @@ require_relative 'assign_account_client' # compose and send email for bisect result class MailBisectResult def initialize(bisect_info)

• @bisect_error = bisect_info['bisect_error']
• @all_errors = bisect_info['all_errors'] @repo = bisect_info['repo'] @commit_id = bisect_info['commit']

• @all_errors = bisect_info['all_errors']
• @bisect_error = bisect_info['bisect_error']
• @pkgbuild_repo = bisect_info['pkgbuild_repo'] @first_bad_commit_result_root = bisect_info['first_bad_commit_result_root'] @git_commit = GitCommit.new(@repo, @commit_id) # now send mail to review

@@ -28,6 +29,7 @@ class MailBisectResult 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"

  data = <<~BODY

@@ -43,6 +45,7 @@ class MailBisectResult all errors/warnings: #{@all_errors}

• #{pkgbuild_repo_url} #{bisect_job_url} #{first_bad_commit_job_url} Regards,

-- 2.23.0