fix gtfs ssl

cmcmarrow · Aug 30, 2023 · da149d7 · da149d7
1 parent e2d43b0
commit da149d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py
@@ -251,6 +251,7 @@ def __init__(
             key_cb=str,
             val_cb=lambda x, y: str(y),
         )
+        self.ssl_verify = self.opts.get(f"{self.role}_ssl_verify", None)
         self.conf = copy.deepcopy(per_remote_defaults)
         # Remove the 'salt://' from the beginning of any globally-defined
         # per-saltenv mountpoints
@@ -823,7 +824,7 @@ def enforce_git_config(self):
                 desired_refspecs,
             )
             if refspecs != desired_refspecs:
-                conf.set_multivar(remote_section, "fetch", self.refspecs)
+                conf.set_multivar(remote_section, "fetch", desired_refspecs)
                 log.debug(
                     "Refspecs for %s remote '%s' set to %s",
                     self.role,
@@ -856,6 +857,7 @@ def enforce_git_config(self):
                     self.id,
                     desired_ssl_verify,
                 )
+                self._ssl_verfiy = self.opts.get(f"{self.role}_ssl_verify", None)
                 conf_changed = True
 
             # Write changes, if necessary

diff --git a/tests/pytests/functional/utils/test_gifts.py b/tests/pytests/functional/utils/test_gifts.py
@@ -52,11 +52,11 @@ def _test_gitfs_simple(gitfs_opts):
     g = GitFS(gitfs_opts, ["https://github.com/saltstack/salt-test-pillar-gitfs.git"])
 
 
-# @skipif_no_gitpython
-# def test_gitpython_gitfs_simple(gitpython_gifts_opts):
-#    _test_gitfs_simple(gitpython_gifts_opts)
+@skipif_no_gitpython
+def test_gitpython_gitfs_simple(gitpython_gifts_opts):
+    _test_gitfs_simple(gitpython_gifts_opts)
 
 
-# @skipif_no_pygit2
-# def test_pygit2_gitfs_simple(pygit2_gifts_opts):
-#    _test_gitfs_simple(pygit2_gifts_opts)
+@skipif_no_pygit2
+def test_pygit2_gitfs_simple(pygit2_gifts_opts):
+    _test_gitfs_simple(pygit2_gifts_opts)