Skip to content

Commit

Permalink
Fix molecule roles searching
Browse files Browse the repository at this point in the history
And clean some remaining `pip install` stuff in favor of `uv pip`.
  • Loading branch information
fauust committed Jan 29, 2025
1 parent 8be1a71 commit e6fa74f
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 216 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install: ## Install all necessary tools
@echo -e "source $(VENV_DIR)/bin/activate"

install-pip-packages: ## Install python3 requirements
$(info --> Install requirements via `pip3`)
$(info --> Install requirements via `uv pip`)
@( \
source $(VENV_DIR)/bin/activate; \
uv pip install -r requirements.txt; \
Expand All @@ -28,9 +28,6 @@ install-galaxy: ## Install galaxy requirements
$(info --> Install galaxy requirements)
ansible-galaxy collection install -r requirements.yml --force -p $(VENDOR_DIR)/collections

upgrade-pip-packages: ## Upgrade python3 requirements
$(shell command -v pip3) install -U -r requirements.txt

install-pre-commit: ## Install pre-commit tool
$(info --> Install pre-commit tool via `pip3`)
uv pip install pre-commit
Expand Down
1 change: 1 addition & 0 deletions molecule/cluster/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ provisioner:
ANSIBLE_DISPLAY_SKIPPED_HOSTS: false
ANSIBLE_FORCE_COLOR: true
ANSIBLE_GATHERING: explicit
ANSIBLE_ROLES_PATH: ../../..
playbooks:
converge: ${MOLECULE_PLAYBOOK:-converge.yml}
verifier:
Expand Down
1 change: 1 addition & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ provisioner:
ANSIBLE_DISPLAY_SKIPPED_HOSTS: false
ANSIBLE_FORCE_COLOR: true
ANSIBLE_GATHERING: explicit
ANSIBLE_ROLES_PATH: ../../..
playbooks:
converge: ${MOLECULE_PLAYBOOK:-converge.yml}
verifier:
Expand Down
9 changes: 0 additions & 9 deletions molecule/vagrant/converge.yml

This file was deleted.

38 changes: 0 additions & 38 deletions molecule/vagrant/molecule.yml

This file was deleted.

1 change: 0 additions & 1 deletion molecule/vagrant/vars/Debian.yml

This file was deleted.

1 change: 0 additions & 1 deletion molecule/vagrant/vars/RedHat.yml

This file was deleted.

47 changes: 0 additions & 47 deletions molecule/vagrant/vars/testvars.yml

This file was deleted.

116 changes: 0 additions & 116 deletions molecule/vagrant/verify.yml

This file was deleted.

0 comments on commit e6fa74f

Please sign in to comment.