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.

Sign up for GitHub

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

Jump to bottom

Adapt UD and wsmaster to new plugin notation #13204

Merged
merged 21 commits into from
May 2, 2019
Merged

Adapt UD and wsmaster to new plugin notation #13204

merged 21 commits into from
May 2, 2019

Conversation

garagatyi
Copy link

@garagatyi garagatyi commented Apr 22, 2019 •
edited
Loading

What does this PR do?

Change UD to be able to use both new and old plugin entries in workspace attributes and plugin registry index.json.
Change wsmaster to support both new and old notation of plugins.
Change version of plugin broker to one that supports new plugins notation.

Thanks @ashumilova for helping with changes in UD!

What issues does this PR fix or reference?

Fixes to eclipse-che/che-plugin-registry#55

Release Notes

Docs PR

@eclipse-che eclipse-che deleted a comment from todo bot Apr 22, 2019
@garagatyi
Copy link
Author

@ashumilova Please, review changes in UD

@garagatyi garagatyi changed the title Adapt UD as wsmaster to new plugin notation Adapt UD and wsmaster to new plugin notation Apr 23, 2019
Oleksandr Garagatyi added 2 commits April 25, 2019 11:15
Small refactoring of PluginFQNParser
748300f 
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
Rework
b0d4140 
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
@eclipse-che eclipse-che deleted a comment from todo bot Apr 25, 2019
@eclipse-che eclipse-che deleted a comment from todo bot Apr 25, 2019
@garagatyi
Copy link
Author

ci-build

@garagatyi garagatyi marked this pull request as ready for review April 25, 2019 14:40
@garagatyi
Copy link
Author

ci-test

@che-bot
Copy link
Contributor

che-bot commented Apr 26, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

sleshchenko
sleshchenko reviewed Apr 26, 2019
View reviewed changes
Copy link
Member

@sleshchenko sleshchenko left a comment

Choose a reason for hiding this comment

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

In general looks good.
Please take a look my inline comments

assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties Outdated Show resolved Hide resolved
assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties Outdated Show resolved Hide resolved
ide/che-core-ide-stacks/src/main/resources/stacks.json Outdated Show resolved Hide resolved
.../java/org/eclipse/che/api/devfile/server/convert/component/plugin/PluginReferenceParser.java Outdated Show resolved Hide resolved
...main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/MachineResolver.java Outdated Show resolved Hide resolved
...-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java Show resolved Hide resolved
amisevsk
amisevsk approved these changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@amisevsk amisevsk left a comment

Choose a reason for hiding this comment

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

LGTM, a few optional comments.

...main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/MachineResolver.java Outdated Show resolved Hide resolved
.../java/org/eclipse/che/api/devfile/server/convert/component/plugin/PluginReferenceParser.java Outdated Show resolved Hide resolved
...e/src/test/java/org/eclipse/che/api/devfile/server/convert/DefaultEditorProvisionerTest.java Outdated Show resolved Hide resolved
...-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java Show resolved Hide resolved
...-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java Outdated Show resolved Hide resolved
...-workspace/src/main/java/org/eclipse/che/api/workspace/server/wsplugins/PluginFQNParser.java Outdated Show resolved Hide resolved
Do not add plugin name to container name since it exceeds max allowed…
5f55eb1 
… chars

Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
@che-bot
Copy link
Contributor

che-bot commented Apr 26, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

@che-bot
Copy link
Contributor

che-bot commented Apr 27, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

@garagatyi garagatyi requested a review from a user April 28, 2019 06:37
@garagatyi
Copy link
Author

ci-test

This was referenced Apr 28, 2019
Merged
Merged
Closed
@che-bot
Copy link
Contributor

che-bot commented Apr 28, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

@garagatyi
Copy link
Author

ci-test

@che-bot
Copy link
Contributor

che-bot commented Apr 28, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

@garagatyi
Copy link
Author

ci-test

@che-bot
Copy link
Contributor

che-bot commented Apr 29, 2019

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:13204
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

@ibuziuk ibuziuk mentioned this pull request Apr 30, 2019
Closed
@garagatyi
Copy link
Author

garagatyi commented Apr 30, 2019 •
edited
Loading

It seems @riuvshin has started release process #13264. I believe that this PR is ready to be merged, though QA team hasn't said their go since it is say off in their location.
@l0rd Are you OK if naming convention changes would go into the next release?
@riuvshin is there any chance to include this PR into the current release yet?

@artaleks9
Copy link
Contributor

Selenium tests execution on Eclipse Che Multiuser on OCP (https://ci.codenvycorp.com/job/che-pullrequests-test-ocp/1761/) doesn't show any regression against this Pull Request.

@garagatyi
Copy link
Author

@artaleks9 @SkorikSergey thanks for checking it out!

@garagatyi garagatyi merged commit 35ce354 into eclipse-che:master May 2, 2019
@garagatyi garagatyi deleted the publisher2 branch May 2, 2019 06:50
@ibuziuk ibuziuk mentioned this pull request May 2, 2019
Merged
riuvshin pushed a commit that referenced this pull request May 3, 2019
Adapt UD and wsmaster to new plugin notation (#13204)
0b97371 
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
skabashnyuk pushed a commit that referenced this pull request Jan 3, 2020
Adapt UD and wsmaster to new plugin notation (#13204)
6991998 
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sleshchenko sleshchenko sleshchenko left review comments

@amisevsk amisevsk amisevsk approved these changes

@ibuziuk ibuziuk ibuziuk approved these changes

@ashumilova ashumilova ashumilova approved these changes

@skabashnyuk skabashnyuk skabashnyuk approved these changes

@mshaposhnik mshaposhnik mshaposhnik approved these changes

@benoitf benoitf Awaiting requested review from benoitf

@metlos metlos Awaiting requested review from metlos

@vparfonov vparfonov Awaiting requested review from vparfonov

@l0rd l0rd Awaiting requested review from l0rd

@riuvshin riuvshin Awaiting requested review from riuvshin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@garagatyi @che-bot @artaleks9 @ibuziuk @ashumilova @skabashnyuk @mshaposhnik @sleshchenko @amisevsk