[drci] add sev info to dr ci comment (#829)

clee2000 · web-flow · commit c267d3a869b5 · 2022-10-03T09:54:12.000-07:00
Links to sev go to hud, which then redirect to back to github. This is because if I link the github issue directly, the PR would get mentioned in the sev, and even editing the comment to get rid of the link won't get rid of the mention * change rockset query to include body of issue to know if the sev is merge blocking * moves a mostly duplicate function `getDrciComment` from drciBot.ts and drci.ts to the drci bot utils file looks like ![image](https://user-images.githubusercontent.com/44682903/193171743-cf3a9cf6-4bb0-45d8-8501-521ae6a87cff.png)
diff --git a/torchci/lib/bot/drciBot.ts b/torchci/lib/bot/drciBot.ts
@@ -1,24 +1,7 @@
-import { Context, Probot } from "probot";
-import { DRCI_COMMENT_START, OWNER, REPO, formDrciComment } from "lib/drciUtils";
+import { Probot } from "probot";
+import { OWNER, REPO, formDrciComment, getDrciComment, getActiveSEVs, formDrciSevBody } from "lib/drciUtils";
+import fetchIssuesByLabel from "lib/fetchIssuesByLabel";
 
-async function getDrciComment(
-  context: Context,
-  owner: string,
-  repo: string,
-  prNum: number,
-): Promise<{ id: number; body: string }> {
-  const commentsRes = await context.octokit.issues.listComments({
-    owner: owner,
-    repo: repo,
-    issue_number: prNum,
-  });
-  for (const comment of commentsRes.data) {
-    if (comment.body!.includes(DRCI_COMMENT_START)) {
-      return { id: comment.id, body: comment.body! };
-    }
-  }
-  return { id: 0, body: "" };
-}
 
 export default function drciBot(app: Probot): void {
   app.on(
@@ -45,14 +28,15 @@ export default function drciBot(app: Probot): void {
       context.log(prOwner);
 
       const existingDrciData = await getDrciComment(
-        context,
+        context.octokit,
         owner,
         repo,
-        prNum,
+        prNum
       );
       const existingDrciID = existingDrciData.id;
       const existingDrciComment = existingDrciData.body;
-      const drciComment = formDrciComment(prNum);
+      const sev = getActiveSEVs(await fetchIssuesByLabel("ci: sev"));
+      const drciComment = formDrciComment(prNum, "", formDrciSevBody(sev));
 
       if (existingDrciComment === drciComment) {
         return;
diff --git a/torchci/lib/drciUtils.ts b/torchci/lib/drciUtils.ts
@@ -1,3 +1,7 @@
+import _ from "lodash";
+import { Octokit } from "octokit";
+import { IssueData } from "./types";
+
 export const NUM_MINUTES = 15;
 export const REPO: string = "pytorch";
 export const OWNER: string = "pytorch";
@@ -24,14 +28,82 @@ Note: Links to docs will display an error until the docs builds have been comple
 }
 
 export function formDrciComment(
-    pr_num: number,
-    pr_results: string = "",
+  pr_num: number,
+  pr_results: string = "",
+  sevs: string = ""
 ): string {
-    const header = formDrciHeader(pr_num);
-    const comment =
-        `${DRCI_COMMENT_START}
+  const header = formDrciHeader(pr_num);
+  const comment = `${DRCI_COMMENT_START}
 ${header}
+${sevs}
 ${pr_results}
 ${DRCI_COMMENT_END}`;
-    return comment;
+  return comment;
+}
+
+
+export async function getDrciComment(
+  octokit: Octokit,
+  owner: string,
+  repo: string,
+  prNum: number
+): Promise<{ id: number; body: string }> {
+  const commentsRes = await octokit.rest.issues.listComments({
+    owner: owner,
+    repo: repo,
+    issue_number: prNum,
+  });
+  for (const comment of commentsRes.data) {
+    if (comment.body!.includes(DRCI_COMMENT_START)) {
+      return { id: comment.id, body: comment.body! };
+    }
+  }
+  return { id: 0, body: "" };
+}
+
+export function getActiveSEVs(issues: IssueData[]): [IssueData[], IssueData[]] {
+  const activeSEVs = issues.filter(
+    (issue: IssueData) => issue.state === "open"
+  );
+  return _.partition(activeSEVs, (issue: IssueData) =>
+    issue.body.toLowerCase().includes("merge blocking")
+  );
+}
+
+export function formDrciSevBody(sevs: [IssueData[], IssueData[]]): string {
+  const [mergeBlocking, notMergeBlocking] = sevs;
+  if (mergeBlocking.length + notMergeBlocking.length === 0) {
+    return "";
+  }
+  const sev_list = mergeBlocking
+    .concat(notMergeBlocking)
+    .map(
+      (issue: IssueData) =>
+        `* ${
+          issue.body.toLowerCase().includes("merge blocking")
+            ? "(merge blocking) "
+            : ""
+        }[${issue.title}](${issue.html_url.replace(
+          "github.com",
+          "hud.pytorch.org"
+        )})`
+    )
+    .join("\n");
+  if (mergeBlocking.length > 0) {
+    return (
+      `## :heavy_exclamation_mark: ${mergeBlocking.length} Merge Blocking SEVs
+There is ${mergeBlocking.length} active merge blocking SEVs` +
+      (notMergeBlocking.length > 0
+        ? ` and ${notMergeBlocking.length} non merge blocking SEVs`
+        : "") +
+      `.  Please view them below:
+${sev_list}\n
+If you must merge, use \`@pytorchbot merge -f\`.`
+    );
+  } else {
+    return `## :heavy_exclamation_mark: ${notMergeBlocking.length} Active SEVs
+There are ${notMergeBlocking.length} currently active SEVs.   If your PR is affected, please view them below:
+${sev_list}\n
+`;
+  }
 }
diff --git a/torchci/lib/types.ts b/torchci/lib/types.ts
@@ -62,6 +62,7 @@ export interface IssueData {
   title: string;
   html_url: string;
   state: "open" | "closed";
+  body: string;
 }
 
 export interface HudParams {
diff --git a/torchci/pages/[repoOwner]/[repoName]/issues/[issueNumber].tsx b/torchci/pages/[repoOwner]/[repoName]/issues/[issueNumber].tsx
@@ -0,0 +1,12 @@
+import { useRouter } from "next/router";
+import React from "react";
+
+export default function Page() {
+  const router = useRouter();
+  const { repoOwner, repoName, issueNumber } = router.query;
+  if (repoOwner && repoName && issueNumber) {
+    const githubLink = `https://github.com/${repoOwner}/${repoName}/issues/${issueNumber}`;
+    window.location.replace(githubLink);
+    return <div>Redirecting to <a href={githubLink}>github</a></div>;
+  }
+}
diff --git a/torchci/pages/api/drci/drci.ts b/torchci/pages/api/drci/drci.ts
@@ -1,9 +1,17 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 import { getOctokit } from "lib/github";
-import { Octokit } from "octokit";
 import fetchRecentWorkflows from "lib/fetchRecentWorkflows";
 import { RecentWorkflowsData } from "lib/types";
-import { NUM_MINUTES, REPO, DRCI_COMMENT_END, formDrciComment, OWNER } from "lib/drciUtils";
+import {
+  NUM_MINUTES,
+  REPO,
+  formDrciComment,
+  OWNER,
+  getDrciComment,
+  getActiveSEVs,
+  formDrciSevBody,
+} from "lib/drciUtils";
+import fetchIssuesByLabel from "lib/fetchIssuesByLabel";
 
 interface PRandJobs {
     head_sha: string;
@@ -30,12 +38,13 @@ export async function updateDrciComments() {
     );
 
     const workflowsByPR = reorganizeWorkflows(recentWorkflows);
+    const sevs = getActiveSEVs(await fetchIssuesByLabel("ci: sev"));
 
     for (const [pr_number, pr_info] of workflowsByPR) {
         const { pending, failedJobs } = getWorkflowJobsStatuses(pr_info);
 
         const failureInfo = constructResultsComment(pending, failedJobs, pr_info.head_sha);
-        const comment = formDrciComment(pr_number, failureInfo);
+        const comment = formDrciComment(pr_number, failureInfo, formDrciSevBody(sevs));
 
         await updateCommentWithWorkflow(pr_info, comment);
     }
@@ -122,14 +131,9 @@ export async function updateCommentWithWorkflow(
     pr_info: PRandJobs,
     comment: string,
 ): Promise<void> {
-    const { pr_number, owner_login } = pr_info;
+    const { pr_number } = pr_info;
     const octokit = await getOctokit(OWNER, REPO);
-    const { id, body } = await getDrciComment(
-        pr_number!,
-        OWNER,
-        REPO,
-        octokit
-    );
+    const { id, body } = await getDrciComment(octokit, OWNER, REPO, pr_number!);
 
     if (id === 0 || body === comment) {
         return;
@@ -142,22 +146,3 @@ export async function updateCommentWithWorkflow(
         comment_id: id,
     });
 }
-
-async function getDrciComment(
-    prNum: number,
-    owner: string,
-    repo: string,
-    octokit: Octokit
-): Promise<{ id: number; body: string }> {
-    const commentsRes = await octokit.rest.issues.listComments({
-        owner,
-        repo,
-        issue_number: prNum,
-    });
-    for (const comment of commentsRes.data) {
-        if (comment.body!.includes(DRCI_COMMENT_END)) {
-            return { id: comment.id, body: comment.body! };
-        }
-    }
-    return { id: 0, body: "" };
-}
diff --git a/torchci/rockset/commons/__sql/issue_query.sql b/torchci/rockset/commons/__sql/issue_query.sql
@@ -3,8 +3,9 @@ SELECT
     issue.title,
     issue.html_url,
     issue.state,
+    issue.body
 from
     issues as issue
     cross join UNNEST(issue.labels as label) as labels
 where
-    labels.label.name = :label
+    labels.label.name = :label
diff --git a/torchci/rockset/prodVersions.json b/torchci/rockset/prodVersions.json
@@ -6,7 +6,7 @@
     "slow_tests": "ef8d035d23aa8ab6",
     "test_time_per_file": "50cb3694334ed63a",
     "test_time_per_file_periodic_jobs": "39c105542e297c09",
-    "issue_query": "f29a1afe94563601",
+    "issue_query": "5d4dfeb992e2f29b",
     "failure_samples_query": "ab2b589414b966a8",
     "recent_pr_workflows_query": "4e03cb13e8372050",
     "reverted_prs_with_reason": "bf2b0607bddcc552",
diff --git a/torchci/test/disableFlakyBot.test.ts b/torchci/test/disableFlakyBot.test.ts
@@ -145,6 +145,7 @@ describe("Disable Flaky Test Bot Integration Tests", () => {
         title: "DISABLED test_a (__main__.suite_a)",
         html_url: "https://api.github.com/repos/pytorch/pytorch/issues/1",
         state: "open" as "open" | "closed",
+        body: "random"
       },
     ];
 
@@ -179,6 +180,7 @@ describe("Disable Flaky Test Bot Integration Tests", () => {
         title: "DISABLED test_a (__main__.suite_a)",
         html_url: "https://api.github.com/pytorch/pytorch/issues/1",
         state: "closed" as "open" | "closed",
+        body: "random"
       },
     ];
 
diff --git a/torchci/test/drci.test.ts b/torchci/test/drci.test.ts
diff --git a/torchci/test/drciBot.test.ts b/torchci/test/drciBot.test.ts

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ export interface IssueData {`
`62`	`62`	`title: string;`
`63`	`63`	`html_url: string;`
`64`	`64`	`state: "open" \| "closed";`
	`65`	`+ body: string;`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`export interface HudParams {`