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

Update auditbeat pipeline to match Jenkins steps #39245

Merged
merged 17 commits into from
May 2, 2024

Conversation

oakrizan
Copy link
Contributor

@oakrizan oakrizan commented Apr 27, 2024

Proposed commit message

In scope of https://github.com/elastic/ingest-dev/issues/3254 - updated auditbeat pipeline to match same steps & commands as in Jenkins.
Jenkins vs. Buildkite comparison: https://gist.github.com/oakrizan/3af834fc51eabf9b9b8b910133886320
BK builds: https://buildkite.com/elastic/auditbeat/builds?branch=oakrizan%3Aauditbeat-postmigration-fixes

MacOS test failure is not related to current PR (more details in gist).
MacOS TMP folder error issue - https://github.com/elastic/ingest-dev/issues/3268
Intgration test timeout error issue - https://github.com/elastic/ingest-dev/issues/3270

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@oakrizan oakrizan added :Windows macOS Enable builds in the CI for darwin testing arm Enable builds in the CI for ARM testing backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify Team:Ingest-EngProd backport-v8.14.0 Automated backport with mergify labels Apr 27, 2024
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 27, 2024
@oakrizan oakrizan force-pushed the auditbeat-postmigration-fixes branch from b5023e4 to 23fd2a0 Compare April 27, 2024 09:02
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 27, 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 42 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!)

@oakrizan oakrizan force-pushed the auditbeat-postmigration-fixes branch 3 times, most recently from 412a4c4 to 607b29e Compare April 29, 2024 12:04
@oakrizan oakrizan marked this pull request as ready for review April 29, 2024 12:33
@oakrizan oakrizan requested a review from a team as a code owner April 29, 2024 12:33
@oakrizan oakrizan force-pushed the auditbeat-postmigration-fixes branch 3 times, most recently from 9237ec7 to 8b8c2ff Compare April 30, 2024 21:51
@oakrizan oakrizan requested a review from a team as a code owner April 30, 2024 21:51
@dliappis dliappis force-pushed the auditbeat-postmigration-fixes branch from 23a3204 to 666f532 Compare May 2, 2024 08:53
@dliappis
Copy link
Contributor

dliappis commented May 2, 2024

@oakrizan as you're on PTO, I updated this PR with some minimal comments/changes and re:

  1. MacOS TMP folder error issue - https://github.com/elastic/ingest-dev/issues/3268
  2. Integration test timeout error issue - https://github.com/elastic/ingest-dev/issues/3270

I've reverted muting the tests for both as it should be done after consulting the corresponding teams.

For 2. @pkoutsovasilis raised a fix, which we tested with this PR by cherry-picking his fix in 907f94a . With that, the tests succeeded: https://buildkite.com/elastic/auditbeat/builds/4581#018f3896-f533-4678-af93-acac60fc452b/147-150 . I will revert the commit before merging, as it should be fixed via a separate PR that @pkoutsovasilis will raise.

For 1. I raised the attention on https://github.com/elastic/ingest-dev/issues/3270 which will be looked at by the corresponding team.

@dliappis
Copy link
Contributor

dliappis commented May 2, 2024

For 1. I raised the attention on elastic/ingest-dev#3270 which will be looked at by the corresponding team.

@pkoutsovasilis also raised a fix for this pkoutsovasilis@eabfda2 which appears to have resolved the macOS failures: https://buildkite.com/elastic/auditbeat/builds/4593#018f3900-f651-42e4-bc2f-d62a14092e22

Copy link
Contributor

mergify bot commented May 2, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b auditbeat-postmigration-fixes upstream/auditbeat-postmigration-fixes
git merge upstream/main
git push upstream auditbeat-postmigration-fixes

@dliappis
Copy link
Contributor

dliappis commented May 2, 2024

With the fixes for macOS and auditbeat integration tests by @pkoutsovasilis cherry picked, all tests (using the labels macOS, :integration, :Windows, arm) are successful[^1]

https://buildkite.com/elastic/beats/builds/6929

[^1] except Linux packaging for x-pack/auditbeat which failed due to a timeout

@dliappis
Copy link
Contributor

dliappis commented May 2, 2024

Now that the test fixes have been raised in separate PRs: #39362 / #39361, I've reverted the cherry picks #39245 (commits) so that this is a clean PR related to Buildkite auditbeat fixes only.

Once (basic) CI is green, I'll merge it and begin the backport process.

@dliappis dliappis requested review from dliappis and removed request for a team May 2, 2024 13:29
Copy link
Contributor

@dliappis dliappis left a comment

Choose a reason for hiding this comment

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

LGTM based on #39245 (comment)

@dliappis dliappis merged commit c1663a3 into elastic:main May 2, 2024
147 of 173 checks passed
mergify bot pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254
---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)
mergify bot pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254
---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)
mergify bot pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254
---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)
dliappis pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254
---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)

Co-authored-by: Olga Naydyonock <[email protected]>
dliappis pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)
dliappis pushed a commit that referenced this pull request May 2, 2024
This commit updates the `auditbeat` pipeline to match same steps & commands as in Jenkins.
Relates: https://github.com/elastic/ingest-dev/issues/3254

---------

Co-authored-by: Dimitrios Liappis <[email protected]>
(cherry picked from commit c1663a3)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
arm Enable builds in the CI for ARM testing backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.13.0 Automated backport with mergify backport-v8.14.0 Automated backport with mergify :integrations macOS Enable builds in the CI for darwin testing Team:Ingest-EngProd :Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants