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 #39506) Remove hardcoded module definitions in CI #39527

Merged
merged 2 commits into from
May 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Proposed commit message

For reasons described in 1, we hard coded aws or kubernetes for the env var MODULE, when no file changes were detected under modules/ per project.

This commit reverts this and allows all module tests to run if no changesets apply. As discussed in 1, for the tests to run properly (and not go into an infinite loop)
if there are no module changes the MODULE env var should not be set, rather than set to an empty string.

This commit is an important fix as it covers a major delta in test coverage between Jenkins and Buildkite.

Related issues

Closes https://github.com/elastic/ingest-dev/issues/2993

Screenshots

Logs/Tests


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

Footnotes

  1. https://github.com/elastic/ingest-dev/issues/2993#issuecomment-2104741977 2

For reasons described in [^1], we hard coded `aws` or `kubernetes` for the env var `MODULE`, when no file changes were detected under `modules/` per project.

This commit reverts this and allows all module tests to run if no changesets apply. As discussed in [^1], for the tests to run properly (and not go into an infinite loop)
if there are no module changes the `MODULE` env var should **not** be set, rather than set to an empty string.

This commit is an important fix as it covers a major delta in test coverage between Jenkins and Buildkite.

Closes https://github.com/elastic/ingest-dev/issues/2993

[^1]: https://github.com/elastic/ingest-dev/issues/2993#issuecomment-2104741977

(cherry picked from commit c91503b)

# Conflicts:
#	.buildkite/metricbeat/pipeline.yml
@mergify mergify bot requested a review from a team as a code owner May 13, 2024 09:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of c91503b has failed:

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

You are currently cherry-picking commit c91503b4cb.
  (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/scripts/changesets.psm1
	modified:   .buildkite/scripts/changesets.sh
	modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/metricbeat/pipeline.yml

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 May 13, 2024
@dliappis dliappis removed conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label labels May 13, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 13, 2024
@dliappis dliappis added Team:Ingest-EngProd and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 13, 2024
@botelastic
Copy link

botelastic bot commented May 13, 2024

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

@dliappis dliappis added the ci label May 13, 2024
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 -- simple backport and a single conflict was resolved. Will merge once ci is green.

@dliappis dliappis merged commit 99d381c into 7.17 May 13, 2024
99 of 100 checks passed
@dliappis dliappis deleted the mergify/bp/7.17/pr-39506 branch May 13, 2024 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant