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

Removed support for gilt #2814

Merged
merged 1 commit into from Sep 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/tox.yml
Expand Up @@ -23,11 +23,11 @@ jobs:
- tox_env: lint
- tox_env: docs
- tox_env: py36
PREFIX: PYTEST_REQPASS=450
PREFIX: PYTEST_REQPASS=432
- tox_env: py37
PREFIX: PYTEST_REQPASS=450
PREFIX: PYTEST_REQPASS=432
- tox_env: py38
PREFIX: PYTEST_REQPASS=450
PREFIX: PYTEST_REQPASS=432
- tox_env: packaging
- tox_env: dockerfile

Expand Down
6 changes: 0 additions & 6 deletions docs/configuration.rst
Expand Up @@ -26,12 +26,6 @@ Ansible Galaxy
.. autoclass:: molecule.dependency.ansible_galaxy.AnsibleGalaxy()
:undoc-members:

Gilt
^^^^

.. autoclass:: molecule.dependency.gilt.Gilt()
:undoc-members:

Shell
^^^^^

Expand Down
4 changes: 1 addition & 3 deletions molecule/config.py
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
118 changes: 0 additions & 118 deletions molecule/dependency/gilt.py

This file was deleted.

4 changes: 2 additions & 2 deletions molecule/dependency/shell.py
Expand Up @@ -34,8 +34,8 @@ class Shell(base.Base):
"""
``Shell`` is an alternate dependency manager.

It is intended to run a command in situations where `Ansible Galaxy`_ and
`Gilt`_ don't suffice.
It is intended to run a command in situations where `Ansible Galaxy`_
don't suffice.

The ``command`` to execute is required, and is relative to Molecule's
project directory when referencing a script not in $PATH.
Expand Down
2 changes: 1 addition & 1 deletion molecule/model/schema_v3.py
Expand Up @@ -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"],
}
},
},
Expand Down
18 changes: 0 additions & 18 deletions molecule/test/functional/test_command.py
Expand Up @@ -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")],
Expand Down
6 changes: 0 additions & 6 deletions molecule/test/scenarios/dependency/molecule/gilt/converge.yml

This file was deleted.

4 changes: 0 additions & 4 deletions molecule/test/scenarios/dependency/molecule/gilt/gilt.yml

This file was deleted.

16 changes: 0 additions & 16 deletions molecule/test/scenarios/dependency/molecule/gilt/molecule.yml

This file was deleted.

@@ -1,6 +1,6 @@
---
dependency:
name: gilt
name: galaxy
driver:
name: delegated
platforms:
Expand Down