diff --git a/regressionFinder.py b/regressionFinder.py index 7def337bafbff8ca3274a19919d04e983f992f8b..9703bf33f6732dbeb86933d8878beb4627d95fcc 100644 --- a/regressionFinder.py +++ b/regressionFinder.py @@ -646,7 +646,7 @@ def lookupCommitByRef(ref, module=""): try: # Get the fetch addresses so we can pull and check out the revision. for item in commitJSON["revisions"]: - if patchset == item["_number"]: + if patchset == commitJSON["revisions"][item]["_number"]: return (commitJSON["revisions"][item]["fetch"]["anonymous http"]["url"], module) except Exception: print(f"Unable to get fetch URL for desired patchset {patchset}") diff --git a/toolbox.js b/toolbox.js index e65793048568f0efa125549eb43ad5dd48669c4c..fcfb7a009ab7a43fa4abdc754e10cb68958f758d 100644 --- a/toolbox.js +++ b/toolbox.js @@ -129,7 +129,7 @@ function jobFormatter(job, hosts, callback) { }/logs/${job.test_hosts[0]}/${job.jobHash}.txt'">View Log`; } - if (job.status != "failed" && job.status != "cancelled") { + if (job.status != "failed" && job.status != "cancelled" && job.status != "finished") { view.cancelButton = ``; @@ -138,6 +138,7 @@ function jobFormatter(job, hosts, callback) { if (view.timeEstimate) view.timeEstimate = `
${view.timeEstimate}` + console.log(job, view); // Return a formatted HTML string of the job to insert into the page. fetch(`http://${domain}:${webPort}/templates/job.mustache`) .then((response) => response.text())