From d21c5d9de0cd2f3124a8218f70c46ab97863a7a2 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 21 Aug 2019 20:47:40 +0200 Subject: dashboard/app: include dashboard link in job reports --- dashboard/app/jobs_test.go | 11 ++++++++--- dashboard/app/mail_test_result.txt | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dashboard/app/jobs_test.go b/dashboard/app/jobs_test.go index 6a782eac0..54f2a679f 100644 --- a/dashboard/app/jobs_test.go +++ b/dashboard/app/jobs_test.go @@ -141,10 +141,11 @@ commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 console output: %[3]v kernel config: %[2]v +dashboard link: https://testapp.appspot.com/bug?extid=%[4]v compiler: compiler1 patch: %[1]v -`, patchLink, kernelConfigLink, logLink)) +`, patchLink, kernelConfigLink, logLink, extBugID)) c.checkURLContents(patchLink, []byte(patch)) c.checkURLContents(kernelConfigLink, build.KernelConfig) c.checkURLContents(logLink, jobDoneReq.CrashLog) @@ -178,10 +179,11 @@ Tested on: commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 kernel config: %[2]v +dashboard link: https://testapp.appspot.com/bug?extid=%[3]v compiler: compiler1 patch: %[1]v -`, patchLink, kernelConfigLink)) +`, patchLink, kernelConfigLink, extBugID)) c.checkURLContents(patchLink, []byte(patch)) c.checkURLContents(kernelConfigLink, build.KernelConfig) } @@ -219,10 +221,11 @@ Tested on: commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 kernel config: %[4]v +dashboard link: https://testapp.appspot.com/bug?extid=%[5]v compiler: compiler1 patch: %[3]v -`, truncatedError, errorLink, patchLink, kernelConfigLink)) +`, truncatedError, errorLink, patchLink, kernelConfigLink, extBugID)) c.checkURLContents(patchLink, []byte(patch)) c.checkURLContents(errorLink, jobDoneReq.Error) c.checkURLContents(kernelConfigLink, build.KernelConfig) @@ -253,6 +256,7 @@ Tested on: commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 kernel config: %[3]v +dashboard link: https://testapp.appspot.com/bug?extid=%[1]v compiler: compiler1 patch: %[2]v @@ -311,6 +315,7 @@ Tested on: commit: 5e6a2eea kernel_commit_title2 git tree: git://mygit.com/git.git kernel config: %[2]v +dashboard link: https://testapp.appspot.com/bug?extid=%[1]v compiler: compiler2 Note: testing is done by a robot and is best-effort only. diff --git a/dashboard/app/mail_test_result.txt b/dashboard/app/mail_test_result.txt index c58328d89..43f0224b1 100644 --- a/dashboard/app/mail_test_result.txt +++ b/dashboard/app/mail_test_result.txt @@ -23,7 +23,8 @@ commit: {{formatShortHash .KernelCommit}} {{formatCommitTableTitle .Kern git tree: {{.KernelRepoAlias}} {{if .LogLink}}console output: {{.LogLink}} {{end}}{{if .KernelConfigLink}}kernel config: {{.KernelConfigLink}} -{{end}}compiler: {{.CompilerID}} +{{end}}dashboard link: {{.Link}} +compiler: {{.CompilerID}} {{if .UserSpaceArch}}userspace arch: {{.UserSpaceArch}} {{end}}{{if .PatchLink}}patch: {{.PatchLink}} {{end}}{{if and (not .CrashTitle) (not .Error)}} -- cgit mrf-deployment