Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.13.x](backport #1208) Feat installer rework 2#1213

Merged
mdelapenya merged 2 commits into7.13.xfrom
mergify/bp/7.13.x/pr-1208
Jun 1, 2021
Merged

[7.13.x](backport #1208) Feat installer rework 2#1213
mdelapenya merged 2 commits into7.13.xfrom
mergify/bp/7.13.x/pr-1208

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 30, 2021

This is an automatic backport of pull request #1208 done by Mergify.
Cherry-pick of f043003 has failed:

On branch mergify/bp/7.13.x/pr-1208
Your branch is up to date with 'origin/7.13.x'.

You are currently cherry-picking commit f043003.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   e2e/_suites/fleet/ingest_manager_test.go
	modified:   e2e/_suites/fleet/stand-alone.go
	modified:   e2e/_suites/fleet/world.go
	modified:   internal/deploy/base.go
	modified:   internal/deploy/docker.go
	modified:   internal/deploy/docker_client.go
	modified:   internal/deploy/docker_client_test.go
	modified:   internal/deploy/kubernetes.go
	new file:   internal/installer/elasticagent_deb.go
	new file:   internal/installer/elasticagent_docker.go
	new file:   internal/installer/elasticagent_rpm.go
	new file:   internal/installer/elasticagent_tar.go
	modified:   internal/kibana/fleet.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   e2e/_suites/fleet/fleet.go
	both modified:   internal/common/defaults.go
	both modified:   internal/installer/base.go
	deleted by them: internal/installer/deb.go
	deleted by them: internal/installer/docker.go
	both modified:   internal/installer/elasticagent.go
	deleted by them: internal/installer/rpm.go
	deleted by them: internal/installer/tar.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@adam-stokes
Feat installer rework 2 (#1208)
ac49d8b 
* Installer refactor

Supports installing services no matter the deployment backend. Also support
installation methods for tar, rpm, deb and easily extensible to exe/dmg for mac
and windows.

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>

* Fixes #1200

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>

* Cleanup dead code

Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com>
(cherry picked from commit f043003)

# Conflicts:
#	e2e/_suites/fleet/fleet.go
#	internal/common/defaults.go
#	internal/installer/base.go
#	internal/installer/deb.go
#	internal/installer/docker.go
#	internal/installer/elasticagent.go
#	internal/installer/rpm.go
#	internal/installer/tar.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 30, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 30, 2021 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1213 updated

  • Start Time: 2021-06-01T15:25:31.659+0000

  • Duration: 25 min 27 sec

  • Commit: f4c25d9

Test stats 🧪

Test Results
Failed 0
Passed 160
Skipped 0
Total 160

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 160
Skipped 0
Total 160

@mdelapenya mdelapenya mentioned this pull request Jun 1, 2021
Closed
@mdelapenya
Copy link
Copy Markdown
Contributor

mdelapenya commented Jun 1, 2021

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 1, 2021

Command refresh: success

Pull request refreshed

@mdelapenya
Copy link
Copy Markdown
Contributor

mdelapenya commented Jun 1, 2021

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 1, 2021

Command refresh: success

Pull request refreshed

@mdelapenya mdelapenya merged commit 853da76 into 7.13.x Jun 1, 2021
@mergify mergify bot deleted the mergify/bp/7.13.x/pr-1208 branch June 1, 2021 16:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@adam-stokes adam-stokes

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @mdelapenya @adam-stokes