[PATCH compass-ci] lib/mail_bisect_result: use new SRV_HTTP host and port for result and git
Reference: 36a7848fe733b36a5b75c81560b32b400c4c1b98
Signed-off-by: Cao Xueliang caoxl78320@163.com --- lib/mail_bisect_result.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 503ed43..7ce5660 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -40,11 +40,12 @@ class MailBisectResult
def compose_mail subject = "[Compass-CI][#{@repo.split('/')[1]}] #{@commit_id[0..9]} #{@bisect_error[0].split("\n")[0]}" - prefix_srv = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_PORT%7D" - bisect_job_url = ENV['result_root'] ? "bisect job result directory:\n#{prefix_srv}#{ENV['result_root']}\n" : '' + prefix_srv_result = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_RESULT_PORT%7D" + prefix_srv_git = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_GIT_PORT%7D" + bisect_job_url = ENV['result_root'] ? "bisect job result directory:\n#{prefix_srv_result}#{ENV['result_root']}\n" : '' report_doc = "bisect email doc:\nhttps://gitee.com/wu_fengguang/compass-ci/blob/master/doc/bisect_email.en.md..." - pkgbuild_repo_url = "PKGBUILD:\n#{prefix_srv}/git/#{@pkgbuild_repo}\n" - first_bad_commit_job_url = "first bad commit job result directory:\n#{prefix_srv}#{@first_bad_commit_result_root}\n" + pkgbuild_repo_url = "PKGBUILD:\n#{prefix_srv_git}/git/#{@pkgbuild_repo}\n" + first_bad_commit_job_url = "first bad commit job result directory:\n#{prefix_srv_result}#{@first_bad_commit_result_root}\n"
data = <<~BODY To: #{@to}
Ignored this patch.
Thanks, Xueliang
On Thu, Mar 04, 2021 at 09:27:20AM +0800, Cao Xueliang wrote:
Reference: 36a7848fe733b36a5b75c81560b32b400c4c1b98
Signed-off-by: Cao Xueliang caoxl78320@163.com
lib/mail_bisect_result.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 503ed43..7ce5660 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -40,11 +40,12 @@ class MailBisectResult
def compose_mail subject = "[Compass-CI][#{@repo.split('/')[1]}] #{@commit_id[0..9]} #{@bisect_error[0].split("\n")[0]}"
- prefix_srv = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_PORT%7D"
- bisect_job_url = ENV['result_root'] ? "bisect job result directory:\n#{prefix_srv}#{ENV['result_root']}\n" : ''
- prefix_srv_result = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_RESULT_PORT%7D"
- prefix_srv_git = "http://#%7BSRV_HTTP_DOMAIN%7D:#%7BSRV_HTTP_GIT_PORT%7D"
- bisect_job_url = ENV['result_root'] ? "bisect job result directory:\n#{prefix_srv_result}#{ENV['result_root']}\n" : '' report_doc = "bisect email doc:\nhttps://gitee.com/wu_fengguang/compass-ci/blob/master/doc/bisect_email.en.md..."
- pkgbuild_repo_url = "PKGBUILD:\n#{prefix_srv}/git/#{@pkgbuild_repo}\n"
- first_bad_commit_job_url = "first bad commit job result directory:\n#{prefix_srv}#{@first_bad_commit_result_root}\n"
pkgbuild_repo_url = "PKGBUILD:\n#{prefix_srv_git}/git/#{@pkgbuild_repo}\n"
first_bad_commit_job_url = "first bad commit job result directory:\n#{prefix_srv_result}#{@first_bad_commit_result_root}\n"
data = <<~BODY To: #{@to}
-- 2.23.0
-
Cao Xueliang