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

[7.17](backport #38135) Migrate xpack packetbeat #38313

Merged
merged 4 commits into from
Mar 18, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2024

What is the problem this PR solves?

Jenkins->Buildkite pipelines migration

Migrate x-pack packetbeat pipeline

Example of the pipelines:
beats-xpack-packetbeat
Examples of the affected pipelines:
beats-libbeat
beats-metricbeat
beats-packetbeat
beats-winlogbeat
beats-xpack-libbeat
beats-xpack-metricbeat

Related issues

https://github.com/elastic/ingest-dev/issues/1693
#38142 - related to commented-out Windows system tests


This is an automatic backport of pull request #38135 done by [Mergify](https://mergify.com).

* migrate xpack-metricbeat

---------

Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Julien Lind <[email protected]>
(cherry picked from commit e0d5fe5)

# Conflicts:
#	.buildkite/scripts/setenv.sh
#	x-pack/packetbeat/magefile.go
@mergify mergify bot requested review from a team as code owners March 14, 2024 08:06
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 14, 2024
@mergify mergify bot requested review from belimawr and rdner and removed request for a team March 14, 2024 08:06
Copy link
Contributor Author

mergify bot commented Mar 14, 2024

Cherry-pick of e0d5fe5 has failed:

On branch mergify/bp/7.17/pr-38135
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit e0d5fe5fef.
  (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:   .buildkite/hooks/pre-command
	modified:   .buildkite/scripts/common.sh
	modified:   .buildkite/scripts/generate_xpack_metricbeat_pipeline.sh
	new file:   .buildkite/scripts/generate_xpack_packetbeat_pipeline.sh
	modified:   .buildkite/scripts/win_unit_tests.ps1
	modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/scripts/setenv.sh
	both modified:   x-pack/packetbeat/magefile.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 14, 2024
@botelastic
Copy link

botelastic bot commented Mar 14, 2024

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 14, 2024

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 14 min 11 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@sharbuz
Copy link
Contributor

sharbuz commented Mar 14, 2024

I've removed changes of the x-pack/packetbeat/magefile.go because in 7.17 I don't see these tests.
@pierrehilbert please correct me if I'm wrong...

@pierrehilbert
Copy link
Collaborator

As packetbeat is owned by @elastic/sec-linux-platform, @nfritts will probably know more about that. But if you didn't find those tests, this is probably true.

Copy link
Contributor Author

mergify bot commented Mar 18, 2024

This pull request has not been merged yet. Could you please review and merge it @sharbuz? 🙏

@jlind23 jlind23 merged commit 2352a39 into 7.17 Mar 18, 2024
11 of 12 checks passed
@jlind23 jlind23 deleted the mergify/bp/7.17/pr-38135 branch March 18, 2024 11:39
@jlind23
Copy link
Collaborator

jlind23 commented Mar 18, 2024

Merging this according to the slack convo we had with @sharbuz and @dliappis

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants