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

[freeze]port fix env #65135

Merged
merged 4 commits into from
Sep 13, 2023
Merged

[freeze]port fix env #65135

merged 4 commits into from
Sep 13, 2023

Conversation

cmcmarrow
Copy link
Contributor

@cmcmarrow cmcmarrow commented Sep 6, 2023

What does this PR do?

fix __env__

Changes:

  • Place remotes branch/tag in its own folder ../salt/../hash/branch
    • This includes locks and links
  • Clear gitfs cache on salt version change
    • This is so people don't need to manually clear salt cache when upgrading
  • Add salt working dir ../salt/../work/hash/branch
    • This is so we decrease the chances of stepping on git
  • add fetch_on_fail checkout(self, fetch_on_fail=True)
    • This is so gitpillar does not need worry if a fetch is required when working with dynamic branches
  • Fix clean_old_remotes
  • Fix fetch for __env__
    • add fetch_request - when 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 run fetch
  • Tests

^ fixs
salt-call pillar.data pillarenv=foo
salt-run git_pillar.update

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

@cmcmarrow cmcmarrow requested a review from a team as a code owner September 6, 2023 20:42
@cmcmarrow cmcmarrow requested review from Ch3LL and removed request for a team September 6, 2023 20:42
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title port fix env [freeze] port fix env Sep 6, 2023
@cmcmarrow cmcmarrow added the test:full Run the full test suite label Sep 6, 2023
@cmcmarrow cmcmarrow changed the title [freeze] port fix env [freeze][wip] port fix env Sep 6, 2023
@cmcmarrow cmcmarrow changed the title [freeze][wip] port fix env [freeze]port fix env Sep 8, 2023
@s0undt3ch s0undt3ch requested a review from whytewolf September 13, 2023 07:40
@garethgreenaway garethgreenaway merged commit 83d090e into saltstack:freeze Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test:full Run the full test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants