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

Move legacy src/core_plugins to src/legacy/core_plugins. #26412

Merged
merged 13 commits into from
Dec 3, 2018

Conversation

azasypkin
Copy link
Member

@azasypkin azasypkin commented Nov 29, 2018

In this PR I move src/core_plugins to src/legacy/core_plugins as per #12466 (comment).

First commit just git moves core plugins to a new location and the rest commits are to fix paths within plugins and common code (easier to review commit by commit).

Initially I was planning to move plugin by plugin, but now I feel like it's safer to move it in one go to not break references between plugins and common code.

@azasypkin azasypkin added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Feature:New Platform labels Nov 29, 2018
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-platform

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Copy link
Contributor

@epixa epixa left a comment

Choose a reason for hiding this comment

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

nit: packages/kbn-i18n/README.md has an example using core_plugins that should be updated. It's non-critical though since it's just an example. I didn't see any other references to core_plugins that needed to be updated.

Do not squash+merge. Git diffing works pretty well with renamed files, but it can get tripped up with certain changes when a commit both renames a file and makes changes to it, which can cause unnecessary git conflicts on existing PRs. Either use the rebase+merge or merge+with+commit option instead.

@azasypkin
Copy link
Member Author

Do not squash+merge. Git diffing works pretty well with renamed files, but it can get tripped up with certain changes when a commit both renames a file and makes changes to it, which can cause unnecessary git conflicts on existing PRs. Either use the rebase+merge or merge+with+commit option instead.

Good point, but these two options are marked as Not enabled for this repository for me, how do we deal with that?

@epixa
Copy link
Contributor

epixa commented Nov 30, 2018

I just enabled rebase merge

@epixa epixa mentioned this pull request Nov 30, 2018
6 tasks
@azasypkin azasypkin force-pushed the issue-xxx-move-legacy-plugins branch from 61f8ce3 to 49ccf96 Compare December 3, 2018 10:30
@azasypkin
Copy link
Member Author

Cleanly rebased on the latest master (with fixed CI) and waiting for green CI here to rebase + merge via GitHub.

@azasypkin
Copy link
Member Author

Previous CI run failed because of this (looks like intermittent CI connectivity issue):

12:07:08 	Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to JNLP4-connect connection from kibana-ci-immutable-centos-1543833139078561052.c.elastic-ci-prod.internal/10.224.0.166:46270
12:07:08 		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741)
12:07:08 		at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357)
12:07:08 		at hudson.remoting.Channel.call(Channel.java:955)
12:07:08 		at hudson.FilePath.act(FilePath.java:1161)
12:07:08 		at com.google.jenkins.plugins.storage.AbstractUpload.initiateUploadsAtWorkspace(AbstractUpload.java:378)
12:07:08 		at com.google.jenkins.plugins.storage.AbstractUpload.perform(AbstractUpload.java:166)
12:07:08 		at com.google.jenkins.plugins.storage.AbstractUpload.perform(AbstractUpload.java:133)
12:07:08 		at com.google.jenkins.plugins.storage.GoogleCloudStorageUploader.perform(GoogleCloudStorageUploader.java:110)
12:07:08 		at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20)
12:07:08 		at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744)
12:07:08 		at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690)
12:07:08 		at hudson.model.Build$BuildExecution.post2(Build.java:186)
12:07:08 		at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635)
12:07:08 		at hudson.model.Run.execute(Run.java:1840)
12:07:08 		at hudson.matrix.MatrixRun.run(MatrixRun.java:153)
12:07:08 		at hudson.model.ResourceController.execute(ResourceController.java:97)
12:07:08 		at hudson.model.Executor.run(Executor.java:429)
12:07:08 Caused by: java.net.SocketTimeoutException: connect timed out

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@azasypkin azasypkin merged commit 3427a08 into elastic:master Dec 3, 2018
@azasypkin azasypkin deleted the issue-xxx-move-legacy-plugins branch December 3, 2018 12:03
@azasypkin
Copy link
Member Author

6.x backport is currently blocked by backport of #22944

@azasypkin
Copy link
Member Author

6.x/6.6: 584a777..b5fc9dc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported Feature:New Platform Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v6.6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants