Restore the beats submodule dir after building osqueryd#12767
Open
Restore the beats submodule dir after building osqueryd#12767
Conversation
In the beats submodule directory, .git is a symlink to the parent's .git/modules. When we try to call into the beats mage target to build osquerybeat, only the beats directory gets mounted into the crossbuild container. As a result, the symlink is invalid and the build fails. To work around this problem, we copy the contents of .git/modules/beats into beats/.git before building. However, when building locally, this later causes issues when switching branches, with git complaining about not being able to migrate from beats/.git to .git/modules/beats. Fix this by restoring the previous state after building osquerybeat by calling `git submodule update --no-fetch`.
swiatekm
added
Team:Elastic-Agent-Control-Plane
swiatekm
added
chore
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Contributor
💛 Build succeeded, but was flaky
Failed CI Stepscc @swiatekm |
swiatekm
added
backport-9.3
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
After building osquerybeat, it restores the previous state of the beats submodule directory by calling
git submodule update --no-fetch.Why is it important?
In the beats submodule directory,
.gitis a reference to the parent's.git/modules/beats. When we try to call into the beats mage target to build osquerybeat, only the beats directory gets mounted into the crossbuild container. As a result, the reference is invalid and the build fails.To work around this problem, we copy the contents of
.git/modules/beatsintobeats/.gitbefore building. However, when building locally, this later causes issues when switching branches, with git complaining about not being able to migrate frombeats/.gitto.git/modules/beats.How to test this PR locally
Run
mage otel:osquerybeatCrossBuildExtand checkbeats/.git.