Skip to content

Commit

Permalink
feat (abr-testing): Add labels to ABR Jira Tickets (#16805)
Browse files Browse the repository at this point in the history
<!--
Thanks for taking the time to open a Pull Request (PR)! Please make sure
you've read the "Opening Pull Requests" section of our Contributing
Guide:


https://github.com/Opentrons/opentrons/blob/edge/CONTRIBUTING.md#opening-pull-requests

GitHub provides robust markdown to format your PR. Links, diagrams,
pictures, and videos along with text formatting make it possible to
create a rich and informative PR. For more information on GitHub
markdown, see:


https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax

To ensure your code is reviewed quickly and thoroughly, please fill out
the sections below to the best of your ability!
-->

# Overview

Add labels to ABR JIRA Tickets

## Test Plan and Hands on Testing

Tested script with different robots on different software changes

## Changelog

- Adding label for if SW version is 8.2.0
- Added label if SW version is an internal release by searching for
substring "alpha"
- Added additional error handling for pulling data from ABR data sheets
- Removed parent field - will revisit this later
- 

## Review requests

<!--
- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.
-->

## Risk assessment

<!--
- Indicate the level of attention this PR needs.
- Provide context to guide reviewers.
- Discuss trade-offs, coupling, and side effects.
- Look for the possibility, even if you think it's small, that your
change may affect some other part of the system.
- For instance, changing return tip behavior may also change the
behavior of labware calibration.
- How do your unit tests and on hands on testing mitigate this PR's
risks and the risk of future regressions?
- Especially in high risk PRs, explain how you know your testing is
enough.
-->
  • Loading branch information
rclarke0 authored Nov 25, 2024
1 parent 378a1f2 commit dbe2afe
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 33 deletions.
15 changes: 12 additions & 3 deletions abr-testing/abr_testing/automation/jira_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ def open_issue(self, issue_key: str) -> str:
webbrowser.open(url)
return url

def get_labels(self) -> List[str]:
"""Get list of available labels."""
url = f"{self.url}/rest/api/3/label"
response = requests.request("GET", url, headers=self.headers, auth=self.auth)
return response.json()

def create_ticket(
self,
summary: str,
Expand All @@ -118,18 +124,21 @@ def create_ticket(
priority: str,
components: list,
affects_versions: str,
robot: str,
labels: list,
parent_name: str,
) -> Tuple[str, str]:
"""Create ticket."""
# Check if software version is a field on JIRA, if not replaces with existing version
# TODO: automate parent linking
data = {
"fields": {
"project": {"id": "10273", "key": project_key},
"issuetype": {"name": issue_type},
"summary": summary,
"reporter": {"id": reporter_id},
"assignee": {"id": assignee_id},
"parent": {"key": robot},
# "parent": {"key": parent_name},
"labels": labels,
"priority": {"name": priority},
"components": [{"name": component} for component in components],
"description": {
Expand Down Expand Up @@ -194,6 +203,7 @@ def post_attachment_to_ticket(self, issue_id: str, attachment_path: str) -> None

def get_project_issues(self, project_key: str) -> Dict[str, Any]:
"""Retrieve all issues for the given project key."""
# TODO: add field for ticket type.
headers = {"Accept": "application/json"}
query = {"jql": f"project={project_key}"}
response = requests.request(
Expand All @@ -203,7 +213,6 @@ def get_project_issues(self, project_key: str) -> Dict[str, Any]:
params=query,
auth=self.auth,
)
response.raise_for_status()
return response.json()

def get_project_versions(self, project_key: str) -> List[str]:
Expand Down
72 changes: 42 additions & 30 deletions abr-testing/abr_testing/data_collection/abr_robot_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,20 @@ def compare_lpc_to_historical_data(
& (df_lpc_data["Robot"] == robot)
& (df_lpc_data["Module"] == labware_dict["Module"])
& (df_lpc_data["Adapter"] == labware_dict["Adapter"])
& (df_lpc_data["Run Ending Error"] < 1)
& (df_lpc_data["Run Ending Error"])
< 1
]
# Converts coordinates to floats and finds averages.
x_float = [float(value) for value in relevant_lpc["X"]]
y_float = [float(value) for value in relevant_lpc["Y"]]
z_float = [float(value) for value in relevant_lpc["Z"]]
current_x = round(labware_dict["X"], 2)
current_y = round(labware_dict["Y"], 2)
current_z = round(labware_dict["Z"], 2)
try:
x_float = [float(value) for value in relevant_lpc["X"]]
y_float = [float(value) for value in relevant_lpc["Y"]]
z_float = [float(value) for value in relevant_lpc["Z"]]
current_x = round(labware_dict["X"], 2)
current_y = round(labware_dict["Y"], 2)
current_z = round(labware_dict["Z"], 2)
except (ValueError):
x_float, y_float, z_float = [0.0], [0.0], [0.0]
current_x, current_y, current_z = 0.0, 0.0, 0.0
try:
avg_x = round(mean(x_float), 2)
avg_y = round(mean(y_float), 2)
Expand Down Expand Up @@ -247,7 +252,7 @@ def get_error_runs_from_robot(ip: str) -> List[str]:
f"http://{ip}:31950/runs", headers={"opentrons-version": "3"}
)
run_data = response.json()
run_list = run_data["data"]
run_list = run_data.get("data", [])
for run in run_list:
run_id = run["id"]
num_of_errors = len(run["errors"])
Expand All @@ -258,7 +263,7 @@ def get_error_runs_from_robot(ip: str) -> List[str]:

def get_robot_state(
ip: str, reported_string: str
) -> Tuple[Any, Any, Any, List[str], str]:
) -> Tuple[Any, Any, Any, List[str], List[str], str]:
"""Get robot status in case of non run error."""
description = dict()
# Get instruments attached to robot
Expand All @@ -274,10 +279,11 @@ def get_robot_state(
f"http://{ip}:31950/health", headers={"opentrons-version": "3"}
)
health_data = response.json()
parent = health_data.get("name", "")
print(f"health data {health_data}")
robot = health_data.get("name", "")
# Create summary name
description["robot_name"] = parent
summary = parent + "_" + reported_string
description["robot_name"] = robot
summary = robot + "_" + reported_string
affects_version = health_data.get("api_version", "")
description["affects_version"] = affects_version
# Instruments Attached
Expand All @@ -297,6 +303,12 @@ def get_robot_state(
description[module["moduleType"]] = module
components = ["Flex-RABR"]
components = match_error_to_component("RABR", reported_string, components)
if "alpha" in affects_version:
components.append("flex internal releases")
labels = [robot]
if "8.2" in affects_version:
labels.append("8_2_0")
parent = affects_version + " Bugs"
print(components)
end_time = datetime.now()
print(end_time)
Expand All @@ -317,13 +329,14 @@ def get_robot_state(
parent,
affects_version,
components,
labels,
whole_description_str,
)


def get_run_error_info_from_robot(
ip: str, one_run: str, storage_directory: str
) -> Tuple[str, str, str, List[str], str, str]:
) -> Tuple[str, str, str, List[str], List[str], str, str]:
"""Get error information from robot to fill out ticket."""
description = dict()
# get run information
Expand All @@ -339,16 +352,19 @@ def get_run_error_info_from_robot(
error_code = error_dict["Error_Code"]
error_instrument = error_dict["Error_Instrument"]
# JIRA Ticket Fields

robot = results.get("robot_name", "")
failure_level = "Level " + str(error_level) + " Failure"

components = [failure_level, "Flex-RABR"]
components = match_error_to_component("RABR", str(error_type), components)
print(components)
affects_version = results["API_Version"]
parent = results.get("robot_name", "")
print(parent)
summary = parent + "_" + str(one_run) + "_" + str(error_code) + "_" + error_type
if "alpha" in affects_version:
components.append("flex internal releases")
labels = [robot]
if "8.2" in affects_version:
labels.append("8_2_0")
parent = affects_version + " Bugs"
summary = robot + "_" + str(one_run) + "_" + str(error_code) + "_" + error_type
# Description of error
description["protocol_name"] = results["protocol"]["metadata"].get(
"protocolName", ""
Expand Down Expand Up @@ -430,6 +446,7 @@ def get_run_error_info_from_robot(
parent,
affects_version,
components,
labels,
whole_description_str,
saved_file_path,
)
Expand Down Expand Up @@ -503,18 +520,20 @@ def get_run_error_info_from_robot(
one_run = error_runs[-1] # Most recent run with error.
(
summary,
robot,
parent,
affects_version,
components,
labels,
whole_description_str,
run_log_file_path,
) = get_run_error_info_from_robot(ip, one_run, storage_directory)
else:
(
summary,
robot,
parent,
affects_version,
components,
labels,
whole_description_str,
) = get_robot_state(ip, run_or_other)
# Get Calibration Data
Expand All @@ -525,16 +544,8 @@ def get_run_error_info_from_robot(
print(f"Making ticket for {summary}.")
# TODO: make argument or see if I can get rid of with using board_id.
project_key = "RABR"
print(robot)
try:
parent_key = project_key + "-" + robot.split("ABR")[1]
except IndexError:
parent_key = ""

# Grab all previous issues
all_issues = ticket.issues_on_board(project_key)

# TODO: read board to see if ticket for run id already exists.
all_issues = ticket.issues_on_board(project_key)
# CREATE TICKET
issue_key, raw_issue_url = ticket.create_ticket(
summary,
Expand All @@ -546,7 +557,8 @@ def get_run_error_info_from_robot(
"Medium",
components,
affects_version,
parent_key,
labels,
parent,
)
# Link Tickets
to_link = ticket.match_issues(all_issues, summary)
Expand Down

0 comments on commit dbe2afe

Please sign in to comment.