salt.utils.gitfs: remove dulwich support, make refspecs configurable #39210
Conversation
terminalmage
force-pushed
the
issue36913
branch
from
8d89a0a
to
84347c1
Compare
|
Some tests didn't pass here: https://jenkins.saltstack.com/job/PR/job/salt-pr-rs-cent7-n/8490/ |
|
@cachedout I needed to add the new gitfs_refspecs option to the mocked opts dict in the integration tests. I also added a CLI example to satisfy the test_valid_docs failure, even though it's unrelated to this PR. |
Dulwich still lacks important features, including (but not limited to) the following: - Lack of the necessary support for checking out a ref needed for git_pillar/winrepo support - No support in its config objects for multivar git config items, making it impossible to detect when repos have multiple refspecs set for a given git remote Given this information, and the fact that it trails as a distant third to Pygit2 and GitPython, Salt will cease to support Dulwich as a git interface moving forward.
Also remove dulwich from unit tests
terminalmage
force-pushed
the
issue36913
branch
from
bd41e22
to
fcfc02b
Compare
|
Still have some failing tests, will address them today. |
|
As far as I can tell, tests are passing. The failures I noted yesterday turned out to be caused by the same VM memory issues, as the test VM was unable to shell out to git to do various tasks that can't be handled by GitPython/Pygit2. The SDB test failures were caused by 87fd95d and fixed by @rallytime in #39261. The schema tests are also unrelated and fixed in #39260 (which is pending a merge-forward). The remaining failures are also unrelated. |
|
Yeah, those test failures listed on the Ubuntu build are already present on the branch. I think this looks good. @terminalmage Just to double check: did you put |
|
I did not, I was planning this for a separate PR. I'll have that in shortly. |
|
Awesome! Thanks @terminalmage! |
Dulwich support is being removed for the Oxygen release (see saltstack#39210).
Dulwich support is being removed for the Oxygen release (see #39210).
* upstream/develop: (128 commits) Fix up bad merge nix: Correct documentation for gc nix: Check for nix-collect-garbage Add nix module to Salt Inform on which python version we are running on Restore full user permissions when failing to delete Use six.moves to import cStringIO Remove unused imports salt.utils.gitfs: remove dulwich support, make refspecs configurable (saltstack#39210) Purged trailing whitespace Fix the new jinja_test failures (saltstack#39262) provide the possibility to put extra modules into the thin Add __utils__ to sdb unit test (saltstack#39261) support dryrun for dockerng.sls_build Pylint fix _device_mismatch_ignored will never be True Do boolean check instead len() to test whether string is empty salt/states/blockdev.py Remove blank line Add safety mechanism in shutdown fucntion and add passwd as valid argument ...
Dulwich still lacks important features, including (but not limited to) the
following:
Lack of the necessary support for checking out a ref needed for
git_pillar/winrepo support
No support in its config objects for multivar git config items, making it
impossible to detect when repos have multiple refspecs set for a given git
remote
Given this information, and the fact that it trails as a distant third to
Pygit2 and GitPython, Salt will cease to support Dulwich as a git interface
moving forward.
This pull request also resolves #36913 by making refspecs a configurable
parameter for the salt.utils.gitfs.GitBase subclasses.