Removed support for gilt

As gilt project is not actively maintained, we remove support for installing dependencies with it.
ansible · Sep 1, 2020 · c05bb59 · c05bb59
1 parent 3a3cf05
commit c05bb59
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 372 deletions.
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -26,12 +26,6 @@ Ansible Galaxy
 .. autoclass:: molecule.dependency.ansible_galaxy.AnsibleGalaxy()
    :undoc-members:
 
-Gilt
-^^^^
-
-.. autoclass:: molecule.dependency.gilt.Gilt()
-   :undoc-members:
-
 Shell
 ^^^^^
 

diff --git a/molecule/config.py b/molecule/config.py
@@ -25,7 +25,7 @@
 import pkg_resources
 
 from molecule import api, interpolation, logger, platforms, scenario, state, util
-from molecule.dependency import ansible_galaxy, gilt, shell
+from molecule.dependency import ansible_galaxy, shell
 from molecule.model import schema_v3
 from molecule.provisioner import ansible
 from molecule.util import boolean
@@ -160,8 +160,6 @@ def dependency(self):
         dependency_name = self.config["dependency"]["name"]
         if dependency_name == "galaxy":
             return ansible_galaxy.AnsibleGalaxy(self)
-        elif dependency_name == "gilt":
-            return gilt.Gilt(self)
         elif dependency_name == "shell":
             return shell.Shell(self)
 

diff --git a/molecule/dependency/gilt.py b/molecule/dependency/gilt.py
diff --git a/molecule/model/schema_v3.py b/molecule/model/schema_v3.py
@@ -45,7 +45,7 @@ def pre_validate_base_schema(env, keep_string):
                 "name": {
                     "type": "string",
                     "molecule_env_var": True,
-                    "allowed": ["galaxy", "gilt", "shell"],
+                    "allowed": ["galaxy", "shell"],
                 }
             },
         },

diff --git a/molecule/test/functional/test_command.py b/molecule/test/functional/test_command.py
@@ -126,24 +126,6 @@ def test_command_dependency_ansible_galaxy(
     # assert os.path.isdir(dependency_role)
 
 
-@pytest.mark.parametrize(
-    "scenario_to_test, driver_name, scenario_name",
-    [("dependency", "delegated", "gilt")],
-    indirect=["scenario_to_test", "driver_name", "scenario_name"],
-)
-def test_command_dependency_gilt(
-    request, scenario_to_test, with_scenario, scenario_name
-):
-    options = {"scenario_name": scenario_name}
-    cmd = sh.molecule.bake("dependency", **options)
-    pytest.helpers.run_command(cmd)
-
-    dependency_role = os.path.join(
-        ephemeral_directory("molecule"), "dependency", "gilt", "roles", "timezone"
-    )
-    assert os.path.isdir(dependency_role)
-
-
 @pytest.mark.parametrize(
     "scenario_to_test, driver_name, scenario_name",
     [("dependency", "delegated", "shell")],

diff --git a/molecule/test/scenarios/dependency/molecule/gilt/converge.yml b/molecule/test/scenarios/dependency/molecule/gilt/converge.yml
diff --git a/molecule/test/scenarios/dependency/molecule/gilt/gilt.yml b/molecule/test/scenarios/dependency/molecule/gilt/gilt.yml
diff --git a/molecule/test/scenarios/dependency/molecule/gilt/molecule.yml b/molecule/test/scenarios/dependency/molecule/gilt/molecule.yml
diff --git a/molecule/test/scenarios/plugins/molecule/default/molecule.yml b/molecule/test/scenarios/plugins/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 dependency:
-  name: gilt
+  name: galaxy
 driver:
   name: delegated
 platforms: