[3006.x] Make directory structure the same on WinRepo #66283
Merged
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
|
Test failures look valid |
Fixes winrepo.update_git_repos so that the directory structure is the same whether run on the master or on a minion using salt-call.
Akm0d
approved these changes
Apr 2, 2024
dmurphy18
approved these changes
Apr 3, 2024
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?
Fixes an issue with the
winrepo.update_git_reposrunner where the directory structure differs when run on a master using gitfs or run on a minion using gitpython.What issues does this PR fix or reference?
Fixes:
Previous Behavior
When run using gitfs the file path was (
salt-run winrepo.update_git_reposon Linux):/srv/salt/win/repo_ng/salt-winrepo-ng/_/*When run using GitPython or PyGit2 (
salt-call --local winrepo.update_git_reposon Windows):/srv/salt/win/repo_ng/salt-winrepo-ng_git/*New Behavior
The directory structure is the same regardless of what system is being used:
/srv/salt/win/repo_ng/salt-winrepo-ng/*Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes