-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
[3006.x] Fix env #65017
Merged
Merged
[3006.x] Fix env #65017
Conversation
This file contains 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
salt-project-bot-prod-environment
bot
changed the title
[WIP] Fix env
[master][WIP] Fix env
Aug 21, 2023
salt-project-bot-prod-environment
bot
changed the title
[master][WIP] Fix env
[3006.x][WIP] Fix env
Aug 21, 2023
dmurphy18
approved these changes
Sep 5, 2023
twangboy
approved these changes
Sep 5, 2023
This was referenced Sep 6, 2023
A question on this - is it safe to use multiple gitfs branches/envs on same salt-master BEFORE this change if we set I assume it is safe AFTER this change, especially if the locks move to salt working dir. |
3 tasks
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
fix
__env__
Changes:
../salt/../hash/branch
../salt/../work/hash/branch
fetch_on_fail
checkout(self, fetch_on_fail=True)
clean_old_remotes
__env__
Gitbase.fetch_remotes
is called the current dynamic branch will fetch and all its sister branches will have a fetch_request file placed in its salt working dir. When sister branch inits or goes to checkout it will see the fetch_request and runfetch
^ fixs
salt-call pillar.data pillarenv=foo
salt-run git_pillar.update
TODO later PR:
clear_old_remotes()
will remove any remote branch that has out lived its time to live.What issues does this PR fix or reference?
Fixes: #65002
Fixes: #64999
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes