Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC4J-574 Jirabot improvements #681

Merged
merged 1 commit into from
Feb 21, 2024

Conversation

jpmcmu
Copy link
Contributor

@jpmcmu jpmcmu commented Feb 2, 2024

  • Moved github user dictionary to github action var
  • Changed logic for changing jira issue user

Signed-off-by: James McMullan [email protected]

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change is a breaking change (fix or feature that will cause existing behavior to change).

Checklist:

  • I have created a corresponding JIRA ticket for this submission
  • My code follows the code style of this project.
    • I have applied the Eclipse code-format template provided.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the HPCC Systems CONTRIBUTORS document (https://github.com/hpcc-systems/HPCC-Platform/wiki/Guide-for-contributors).
  • The change has been fully tested:
    • This change does not cause any existing JUnits to fail.
    • I have include JUnit coverage to test this change
    • I have performed system test and covered possible regressions and side effects.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Premature optimization
    • This change fixes the problem, not just the symptom

Testing:

Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpmcmu a couple of var refactoring as mentioned offline.

@jpmcmu jpmcmu changed the base branch from candidate-9.4.x to candidate-8.12.x February 7, 2024 18:52
@jpmcmu jpmcmu changed the title WIP: HPCC4J-574 Jirabot improvements HPCC4J-574 Jirabot improvements Feb 7, 2024
@jpmcmu
Copy link
Contributor Author

jpmcmu commented Feb 7, 2024

@rpastrana Implemented code review changes and rebased to 8.12.x

@jpmcmu jpmcmu requested a review from rpastrana February 7, 2024 18:54
else:
transition = ''

if transition != '':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if transition == '' ?

elif statusName == 'Closed':
transition = 'Reopen Issue'
else:
transition = ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's log this else condition, something like "Unexpected Jira status encountered: statusName"

@@ -67,10 +68,17 @@ jobs:
transitions = jira.transitions(issue)
result += 'Error: Transition: "' + transition + '" failed with: "' + str(error) + '" Valid transitions=' + str(transitions) + '\n'

if issue.fields.customfield_10010 is None:
issue.update(fields={'customfield_10010': pull_url})
prFieldName = propertyMap.get('pullRequestFieldName', 'customfield_10010')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's target the new jira name as a long term solution

Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpmcmu approved, we'll change the default pr custom field name once migrated.

- Moved github user dictionary to github action var
- Changed logic for changing jira issue user
- Added JirabotMerge to 8.12.x
- Backported various Jirabot changes
- Added Jira issue property map

Signed-off-by: James McMullan [email protected]
@jpmcmu
Copy link
Contributor Author

jpmcmu commented Feb 21, 2024

@rpastrana Finished testing the issue property map change, looks good. Squashed and ready to merge if it still looks good

@rpastrana rpastrana merged commit 4793154 into hpcc-systems:candidate-8.12.x Feb 21, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants