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

[UI] Drop the solution page and related test #3167

Merged

Conversation

ChengYanJin
Copy link
Contributor

@ChengYanJin ChengYanJin commented Mar 3, 2021

Component: ui, solutions

Context:
Since the solution UI is not really useful, we decided to completely drop this page as well as the codebase.

Summary:
Removed:

  • Solution page
  • Solution-related test, includes e2e solution in CI as well.
  • Sidebar solution entry
  • Remove all the related translations

Acceptance criteria:
No regression

closes: #3168

@ChengYanJin ChengYanJin requested a review from a team as a code owner March 3, 2021 17:13
@bert-e
Copy link
Contributor

bert-e commented Mar 3, 2021

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 Mar 3, 2021

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
  • development/2.5
  • development/2.6
  • development/2.7

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 Mar 3, 2021

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:

@JBWatenbergScality
Copy link
Contributor

JBWatenbergScality commented Mar 3, 2021

Maybe we should mention this change in the changelog as well.

@ChengYanJin
Copy link
Contributor Author

Maybe we should mention this change in the changelog as well.

Yes. Indeed, I will add a changelog entry.

@ChengYanJin ChengYanJin force-pushed the improvement/remove-the-solution-test-and-drop-the-page branch from da6d746 to c4c9448 Compare March 3, 2021 17:51
"redirecting": "Redirection…",
"documentation": "Documentation",
Copy link
Contributor

Choose a reason for hiding this comment

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

Navbar tests are failling because I think this entry should not have been removed

Copy link
Contributor Author

@ChengYanJin ChengYanJin Mar 4, 2021

Choose a reason for hiding this comment

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

I just realized it as well! Re-adding. Thanks for checking!

@ChengYanJin ChengYanJin force-pushed the improvement/remove-the-solution-test-and-drop-the-page branch from c4c9448 to 24d3555 Compare March 4, 2021 09:30
@bert-e
Copy link
Contributor

bert-e commented Mar 4, 2021

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:

@scality scality deleted a comment from bert-e Mar 4, 2021
@scality scality deleted a comment from bert-e Mar 4, 2021
@scality scality deleted a comment from bert-e Mar 4, 2021
@scality scality deleted a comment from bert-e Mar 4, 2021
@ChengYanJin ChengYanJin linked an issue Mar 4, 2021 that may be closed by this pull request
@bert-e
Copy link
Contributor

bert-e commented Mar 4, 2021

Conflict

There is a conflict between your branch improvement/remove-the-solution-test-and-drop-the-page and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/remove-the-solution-test-and-drop-the-page).

 $ git fetch
 $ git checkout origin/improvement/remove-the-solution-test-and-drop-the-page
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/remove-the-solution-test-and-drop-the-page

@ChengYanJin ChengYanJin force-pushed the improvement/remove-the-solution-test-and-drop-the-page branch 2 times, most recently from e1828f5 to 9087f8f Compare March 5, 2021 09:25
eve/main.yml Outdated Show resolved Hide resolved
@ChengYanJin ChengYanJin force-pushed the improvement/remove-the-solution-test-and-drop-the-page branch 2 times, most recently from da295b5 to a1001a5 Compare March 5, 2021 15:31
@bert-e
Copy link
Contributor

bert-e commented Mar 5, 2021

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:

@bert-e
Copy link
Contributor

bert-e commented Mar 8, 2021

Conflict

There is a conflict between your branch improvement/remove-the-solution-test-and-drop-the-page and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/remove-the-solution-test-and-drop-the-page).

 $ git fetch
 $ git checkout origin/improvement/remove-the-solution-test-and-drop-the-page
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/remove-the-solution-test-and-drop-the-page

@ChengYanJin ChengYanJin force-pushed the improvement/remove-the-solution-test-and-drop-the-page branch from 9db782a to 88602f5 Compare March 9, 2021 10:03
@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

History mismatch

Merge commit #829eedfba3d814adfeb730dc6b38d61e8721551d on the integration branch
w/2.9/improvement/remove-the-solution-test-and-drop-the-page is merging a branch which is neither the current
branch improvement/remove-the-solution-test-and-drop-the-page nor the development branch
development/2.9.

It is likely due to a rebase of the branch improvement/remove-the-solution-test-and-drop-the-page 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

/reset

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Reset complete

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

@scality scality deleted a comment from bert-e Mar 9, 2021
@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

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
  • development/2.5
  • development/2.6
  • development/2.7

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 Mar 9, 2021

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:

@scality scality deleted a comment from bert-e Mar 9, 2021
@scality scality deleted a comment from bert-e Mar 9, 2021
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

CI point of view, LGTM now 😄

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

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.8

  • ✔️ development/2.9

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
  • development/2.5
  • development/2.6
  • development/2.7

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 Mar 9, 2021

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

  • ✔️ development/2.8

  • ✔️ development/2.9

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
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye chengyanjin.

@bert-e bert-e merged commit 88602f5 into development/2.8 Mar 9, 2021
@bert-e bert-e deleted the improvement/remove-the-solution-test-and-drop-the-page branch March 9, 2021 14:49
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.

Remove the Environment page from the MetalK8s UI
4 participants