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

ARTESCA-12459 // Severity icon is not displayed in the Alert email #4499

Merged
merged 1 commit into from
Dec 19, 2024

Conversation

hervedombya
Copy link
Contributor

Component:

Context:

Summary:

Acceptance criteria:


Closes: #ISSUE_NUMBER

@hervedombya hervedombya requested a review from a team as a code owner December 16, 2024 12:54
@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Hello hervedombya,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

MonPote
MonPote previously approved these changes Dec 16, 2024
@hervedombya
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@hervedombya
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 17, 2024

History mismatch

Merge commit #2edde008b03e8b88d824c361742fb5f525634265 on the integration branch
w/130.0/improvement/ARTESCA-12459 is merging a branch which is neither the current
branch improvement/ARTESCA-12459 nor the development branch
development/130.0.

It is likely due to a rebase of the branch improvement/ARTESCA-12459 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

@hervedombya hervedombya changed the base branch from development/129.0 to development/130.0 December 17, 2024 12:50
@bert-e
Copy link
Contributor

bert-e commented Dec 17, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

Update alert email to display severity icon correctly

Fix missing newline at end of email.html file
@hervedombya hervedombya force-pushed the improvement/ARTESCA-12459 branch from bb32aa8 to a34acae Compare December 17, 2024 12:51
@bert-e
Copy link
Contributor

bert-e commented Dec 19, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/130.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ARTESCA-12459.

Goodbye hervedombya.

The following options are set: approve

@bert-e bert-e merged commit a34acae into development/130.0 Dec 19, 2024
27 checks passed
@bert-e bert-e deleted the improvement/ARTESCA-12459 branch December 19, 2024 15:32
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.

4 participants