Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Use component name consistent for reconciliation #818

Closed
wants to merge 1 commit into from
Closed

Use component name consistent for reconciliation #818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions doozerlib/cli/images_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,8 @@ def reconcile_jira_issues(runtime, pr_map: Dict[str, PullRequest.PullRequest], d
for distgit_key, pr in pr_map.items():
image_meta: ImageMetadata = runtime.image_map[distgit_key]
potential_project, potential_component = image_meta.get_jira_info()
summary = f"Update {release_version} {image_meta.name} image to be consistent with ART"
summary = f"Update {release_version} {image_meta.get_component_name()} image to be consistent with ART"
old_summary_format = f"Update {release_version} {image_meta.name} image to be consistent with ART"

project = potential_project
if potential_project not in jira_project_names:
Expand All @@ -677,7 +678,7 @@ def reconcile_jira_issues(runtime, pr_map: Dict[str, PullRequest.PullRequest], d
# If the component in prodsec data does not exist in the Jira project, use Unknown.
component = 'Unknown'

query = f'project={project} AND summary ~ "{summary}" AND statusCategory in ("To Do", "In Progress")'
query = f'project={project} AND ( summary ~ "{summary}" OR summary ~ "{old_summary_format}" ) AND statusCategory in ("To Do", "In Progress")'

@retry(reraise=True, stop=stop_after_attempt(10), wait=wait_fixed(3))
def search_issues(query):
Expand Down Expand Up @@ -1046,7 +1047,7 @@ def check_if_upstream_image_exists(upstream_image):

yellow_print(f'Upstream dockerfile does not match desired state in {public_repo_url}/blob/{public_branch}/{dockerfile_name}')

first_commit_line = f"Updating {image_meta.name} images to be consistent with ART"
first_commit_line = f"Updating {image_meta.get_component_name()} image to be consistent with ART"
reconcile_url = f'{convert_remote_git_to_https(runtime.gitdata.origin_url)}/tree/{runtime.gitdata.commit_hash}/images/{os.path.basename(image_meta.config_filename)}'
reconcile_info = f"Reconciling with {reconcile_url}"

Expand Down