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

Remove deprecated docker infrastructure #14951

Merged
merged 6 commits into from
Oct 29, 2019
Merged

Remove deprecated docker infrastructure #14951

merged 6 commits into from
Oct 29, 2019

Conversation

skabashnyuk
Copy link
Contributor

What does this PR do?

Remove deprecated docker infrastructure

What issues does this PR fix or reference?

#14356

Release Notes

n/a

Docs PR

n/a

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
@che-bot
Copy link
Contributor

che-bot commented Oct 22, 2019

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

@che-bot
Copy link
Contributor

che-bot commented Oct 22, 2019

E2E tests of Eclipse Che Multiuser on OCP has been successful:

@skabashnyuk
Copy link
Contributor Author

@eclipse/eclipse-che-qa can you take a look at tests results?

@che-bot che-bot added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/task Internal things, technical debt, and to-do tasks to be performed. labels Oct 22, 2019
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.

Are there any plans to get rid of docker infra in selenium tests? Maybe in scope of another issue for QE team?

* @return true when wsagent server is found in provided machine, false otherwise
*/
public static boolean containsWsAgentServer(Machine machine) {
return machine.getServers().keySet().contains(Constants.SERVER_WS_AGENT_HTTP_REFERENCE);
Copy link
Member

Choose a reason for hiding this comment

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

Actually it's a good time to get rid of Constants.SERVER_WS_AGENT_HTTP_REFERENCE as well.

P.S. Along with other unused constants like SERVER_WS_AGENT_WEBSOCKET_REFERENCE, SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE, WS_AGENT_PORT

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.

Consider removing AbstractBootstrapper:

 * @deprecated should be removed along with the docker infrastructure
 */
@Deprecated
public abstract class AbstractBootstrapper {

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.

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.

Please take a look my inline comments
Other LGTM

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
@che-bot
Copy link
Contributor

che-bot commented Oct 24, 2019

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
@skabashnyuk
Copy link
Contributor Author

@sleshchenko

  • AbstractBootstrapper - removed
  • Recipe.java#L20 - cleaned up.
  • Constants - propose to handle in separate pr since it requires additional cleaning in K8s/Os infrastructures. And I don't want to mix this change with cleaning since it would be hard to review.

@skabashnyuk
Copy link
Contributor Author

crw-ci-test

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
@che-bot
Copy link
Contributor

che-bot commented Oct 24, 2019

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

@che-bot
Copy link
Contributor

che-bot commented Oct 24, 2019

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

@che-bot
Copy link
Contributor

che-bot commented Oct 24, 2019

E2E tests of Eclipse Che Multiuser on OCP has failed:

@skabashnyuk
Copy link
Contributor Author

ci-test

@che-bot
Copy link
Contributor

che-bot commented Oct 24, 2019

E2E tests of Eclipse Che Multiuser on OCP has been successful:

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.

Looks like the following properties should also be removed:

che.dns.resolvers
che.workspace.hosts
che.docker.always_pull_image
che.docker.privileged
che.docker.pids_limit
che.docker.parent_cgroup
che.docker.cpuset_cpus
che.docker.volumes_projects_options
che.docker.volumes_agent_options
che.docker.ip
che.docker.ip.external
che.docker.cleanup_period_min
che.docker.api
che.docker.enable_container_stop_detector
che.docker.cpu_period
che.docker.cpu_quota
che.docker.network_driver
che.docker.securityopt
che.docker.tcp_connection_timeout_ms
che.docker.tcp_connection_read_timeout_ms
che.docker.swap
che.infra.docker.master_api_endpoint
che.infra.docker.master_websocket_endpoint
che.infra.docker.master_websocket_minor_endpoint
che.infra.docker.bootstrapper.timeout_min
che.infra.docker.bootstrapper.installer_timeout_sec
che.infra.docker.bootstrapper.server_check_period_sec
che.infra.docker.max_pull_threads
che.infra.docker.build_timeout_sec
che.single.port
che.infra.docker.url_rewriter
che.workspace.migrate_workspace_projects_on_startup
che.singleport.wildcard_domain.host

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
@che-bot
Copy link
Contributor

che-bot commented Oct 25, 2019

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

@che-bot
Copy link
Contributor

che-bot commented Oct 25, 2019

E2E tests of Eclipse Che Multiuser on OCP has been successful:

@skabashnyuk skabashnyuk merged commit 947f4d2 into master Oct 29, 2019
@skabashnyuk skabashnyuk deleted the rmdocker branch October 29, 2019 07:08
@che-bot che-bot removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Oct 29, 2019
@che-bot che-bot added this to the 7.4.0 milestone Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/task Internal things, technical debt, and to-do tasks to be performed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants