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

[7.x](backport #1256) fix: use beat_version as fallback if it's provided#1260

Merged
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1256
Jun 14, 2021
Merged

[7.x](backport #1256) fix: use beat_version as fallback if it's provided#1260
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1256

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 14, 2021

This is an automatic backport of pull request #1256 done by Mergify.
Cherry-pick of 55156f1 has failed:

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

You are currently cherry-picking commit 55156f1.
  (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/kubernetes-autodiscover/autodiscover_test.go
	modified:   e2e/_suites/metricbeat/metricbeat_test.go
	modified:   internal/common/defaults.go
	modified:   internal/installer/elasticagent_deb.go
	modified:   internal/installer/elasticagent_docker.go
	modified:   internal/installer/elasticagent_rpm.go
	modified:   internal/installer/elasticagent_tar.go
	modified:   internal/utils/utils.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/utils/utils_test.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/

@mdelapenya
fix: use beat_version as fallback if it's provided (#1256)
fc6399b 
* fix: honour beat_version as fallback

* chore: simplify method, as the init versions already checks the beat version

* chore: simplify method even more

(cherry picked from commit 55156f1)

# Conflicts:
#	internal/utils/utils_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 14, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 14, 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 #1260 updated

  • Start Time: 2021-06-14T14:56:19.707+0000

  • Duration: 22 min 36 sec

  • Commit: 2d0e0c9

Test stats 🧪

Test Results
Failed 0
Passed 202
Skipped 0
Total 202

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 202
Skipped 0
Total 202

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Jun 14, 2021
@mdelapenya mdelapenya merged commit 00a6c9b into 7.x Jun 14, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1256 branch June 14, 2021 15:45
@mdelapenya mdelapenya mentioned this pull request Oct 26, 2021
Merged
8 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@mdelapenya mdelapenya

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mdelapenya