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

Adding upgrader interface #5471

Merged
merged 26 commits into from
Aug 21, 2020
Merged

Adding upgrader interface #5471

merged 26 commits into from
Aug 21, 2020

Conversation

jespino
Copy link
Member

@jespino jespino commented May 11, 2020 •
edited
Loading

@jespino jespino mentioned this pull request May 11, 2020
Merged
@jespino jespino added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label May 11, 2020
@jespino jespino added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels May 11, 2020
coreyhulen
coreyhulen reviewed May 12, 2020
View reviewed changes
Copy link
Contributor

@coreyhulen coreyhulen left a comment

Choose a reason for hiding this comment

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

Code looks good. Still probably going to do some text tweaks.

@srkgupta srkgupta self-requested a review June 15, 2020 12:50
@jespino jespino added Awaiting Submitter Action Blocked on the author and removed 2: Dev Review Requires review by a core commiter labels Jun 17, 2020
srkgupta
srkgupta suggested changes Jun 18, 2020
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Hi @jespino
I tried to test this along with the dependent PRs and currently nothing happens when we click on the Upgrade button on a team edition. Please check this GIF to demonstrate this issue. Can you please check and correct the issue (or) please let me know if I am missing something here:

Kapture 2020-06-18 at 19 12 12

@jespino
Copy link
Member Author

jespino commented Jun 18, 2020

@srkgupta yes, clearly looks like broken, it should be showing an spinner there! maybe the merges has broken it. I'll review it.

@jespino
Copy link
Member Author

jespino commented Jun 18, 2020

@srkgupta now is fixed, take into consideration that the server have to announce himself as a valid published version, for example 5.24, to solve that, at the server side you can go to model/version.go and remove the first two versions there (5.26.0 and 5.25.0)

@jespino
Copy link
Member Author

jespino commented Jun 18, 2020

@srkgupta I'm making some changes to the UI based on some feedback from @jasonblais

@srkgupta
Copy link
Contributor

Hi @jespino
Please re-request my review once the changes are done. Thanks.

srkgupta
srkgupta approved these changes Jul 10, 2020
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Tested the PR along with it's dependencies on Mac instance and now the system properly notifies the user that the upgrade is handled only on linux servers. Was unable to test this PR on a linux instance. @mgdelacroix will help test this on a linux instance and verify if the feature is working fine or not. Will be testing the PR on the test instance once the PR is merged.

@amyblais amyblais added this to the v5.26 milestone Jul 13, 2020
@lindalumitchell lindalumitchell removed the 3: QA Review Requires review by a QA tester label Jul 24, 2020
ashishbhate
ashishbhate approved these changes Jul 24, 2020
View reviewed changes
Copy link
Contributor

@ashishbhate ashishbhate left a comment

Choose a reason for hiding this comment

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

Tested on Linux:

Works as expected. After clicking "Upgrade to Enterprise Edition", I see a download progress, then prompt to restart server, and after restart I can confirm I've been upgraded to E20.

For a server binary without write permissions instructions on changing the binary permissions were displayed
For a server binary owned by root, similar instructions for a system administrator to perform were displayed.

@amyblais amyblais modified the milestones: v5.26, v5.27 Jul 27, 2020
@jespino jespino added 4: Reviews Complete All reviewers have approved the pull request and removed Awaiting Submitter Action Blocked on the author labels Aug 12, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Aug 14, 2020
@jespino jespino removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Aug 21, 2020
@jespino jespino merged commit d055eb1 into mattermost:master Aug 21, 2020
@mattermod
Copy link
Contributor

@jespino
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#5471-upstream-release-5.27-1598035470
Branch 'automated-cherry-pick-of-mattermost-webapp-#5471-upstream-release-5.27-1598035470' set up to track remote branch 'release-5.27' from 'upstream'.

+++ About to attempt cherry pick of PR #5471 with merge commit d055eb1f131fb2d513e69d706f00d37f8ea2fc58.


+++ Conflicts detected:

UU package-lock.json
UU package.json

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

jespino added a commit that referenced this pull request Aug 21, 2020
@jespino
Adding upgrader interface (#5471)
78c4b3f 
* Adding upgrader interface

* Using the new client methods for upgrade/restart and adding translations

* Fix lint

* Pointing to the right branch in mattermost-redux

* Pointing to the right branch in mattermost-redux

* Fixing tests

* i18n

* Handling different text from previous upgrades

* Fix tests

* Adding error handling on starting upgrade

* Fixing restart buton

* Render markdown formatted error from the server

* Adding telemetry to the upgrade process
jespino added a commit that referenced this pull request Aug 21, 2020
@jespino
[Cherry-pick] Adding upgrader interface (#5471) (#6241)
514f532 
* Adding upgrader interface (#5471)

* Adding upgrader interface

* Using the new client methods for upgrade/restart and adding translations

* Fix lint

* Pointing to the right branch in mattermost-redux

* Pointing to the right branch in mattermost-redux

* Fixing tests

* i18n

* Handling different text from previous upgrades

* Fix tests

* Adding error handling on starting upgrade

* Fixing restart buton

* Render markdown formatted error from the server

* Adding telemetry to the upgrade process

* Pointing the web app to the correct mattermost-redux commit
@amyblais amyblais added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Aug 22, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@srkgupta srkgupta srkgupta approved these changes

@coreyhulen coreyhulen coreyhulen approved these changes

@ashishbhate ashishbhate ashishbhate approved these changes

@catalintomai catalintomai catalintomai approved these changes

Assignees

@jespino jespino

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
v5.27.0
Development

Successfully merging this pull request may close these issues.
8 participants
@jespino @srkgupta @mattermod @coreyhulen @ashishbhate @catalintomai @lindalumitchell @amyblais