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

Bugfix/backport add the error handling for salt job #2475

Merged

Conversation

ChengYanJin
Copy link
Contributor

Component: ui

Context: Backport the PR [ui] delete the job when there is error occur #2458 to development 2.5

Summary:

Acceptance criteria:


Closes: #2443

Since we are not sure how to reproduce the error circumstances,
we will just display everything inside the result.error

Refs: #2443
@ChengYanJin ChengYanJin requested a review from a team as a code owner April 24, 2020 15:59
@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2020

Hello chengyanjin,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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

@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2020

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:

@ChengYanJin ChengYanJin force-pushed the bugfix/backport-add-the-error-handling-for-salt-job branch from 9c42904 to 31b2e9c Compare April 24, 2020 16:04
@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2020

History mismatch

Merge commit #9c429049294068562b3bb5f91982c573d64c2b38 on the integration branch
w/2.6/bugfix/backport-add-the-error-handling-for-salt-job is merging a branch which is neither the current
branch bugfix/backport-add-the-error-handling-for-salt-job nor the development branch
development/2.6.

It is likely due to a rebase of the branch bugfix/backport-add-the-error-handling-for-salt-job 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.

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 25, 2020

History mismatch

Merge commit #9c429049294068562b3bb5f91982c573d64c2b38 on the integration branch
w/2.6/bugfix/backport-add-the-error-handling-for-salt-job is merging a branch which is neither the current
branch bugfix/backport-add-the-error-handling-for-salt-job nor the development branch
development/2.6.

It is likely due to a rebase of the branch bugfix/backport-add-the-error-handling-for-salt-job 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

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 25, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 25, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/bugfix/backport-add-the-error-handling-for-salt-job with contents from bugfix/backport-add-the-error-handling-for-salt-job
and development/2.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.6/bugfix/backport-add-the-error-handling-for-salt-job origin/development/2.6
 $ git merge origin/bugfix/backport-add-the-error-handling-for-salt-job
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.6/bugfix/backport-add-the-error-handling-for-salt-job

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 25, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 25, 2020

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

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

Please check the status of the associated issue None.

Goodbye chengyanjin.

@bert-e bert-e merged commit b73c967 into development/2.5 Apr 25, 2020
@bert-e bert-e deleted the bugfix/backport-add-the-error-handling-for-salt-job branch April 25, 2020 08:17
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.

None yet

3 participants