Bump molecule version

Add ansible collection specific requirements since they are no more
installed by default. Also, installing molecule-podman cause error
(https://github.com/ansible-community/molecule/issues/3895)
This commit is contained in:
Faustin Lammler 2023-04-26 09:08:00 +01:00
parent a7b1c2923b
commit 9ab2a3bb24
No known key found for this signature in database
GPG Key ID: 390A2F27832A5C79
4 changed files with 18 additions and 6 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.venv .venv
.vendor

View File

@ -1,4 +1,5 @@
VENV_DIR := .venv VENV_DIR := .venv
VENDOR_DIR := .vendor
SHELL := /usr/bin/env bash SHELL := /usr/bin/env bash
.DEFAULT_GOAL := help .DEFAULT_GOAL := help
@ -10,9 +11,9 @@ venv: ## Create python3 venv if it does not exists
[[ -d $(VENV_DIR) ]] || $(shell command -v python3) -m venv $(VENV_DIR) [[ -d $(VENV_DIR) ]] || $(shell command -v python3) -m venv $(VENV_DIR)
install: ## Install all necessary tools install: ## Install all necessary tools
$(MAKE) \ $(MAKE) venv
venv \ $(MAKE) install-pip-packages
install-pip-packages $(MAKE) install-galaxy
@echo -e "\n--> You should now activate the python3 venv with:" @echo -e "\n--> You should now activate the python3 venv with:"
@echo -e "source $(VENV_DIR)/bin/activate" @echo -e "source $(VENV_DIR)/bin/activate"
@ -20,9 +21,14 @@ install-pip-packages: ## Install python3 requirements
$(info --> Install requirements via `pip3`) $(info --> Install requirements via `pip3`)
@( \ @( \
source $(VENV_DIR)/bin/activate; \ source $(VENV_DIR)/bin/activate; \
pip3 install -U pip; \
pip3 install -r requirements.txt; \ pip3 install -r requirements.txt; \
) )
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 upgrade-pip-packages: ## Upgrade python3 requirements
$(shell command -v pip3) install -U -r requirements.txt $(shell command -v pip3) install -U -r requirements.txt
@ -40,3 +46,4 @@ pre-commit-run-all: ## Run pre-commit on the whole repository
clean: ## Clean venv clean: ## Clean venv
[[ ! -d $(VENV_DIR) ]] || rm -rf $(VENV_DIR) [[ ! -d $(VENV_DIR) ]] || rm -rf $(VENV_DIR)
[[ ! -d $(VENDOR_DIR) ]] || rm -rf $(VENDOR_DIR)

View File

@ -1,3 +1,3 @@
ansible ansible-core
molecule==4.0.* molecule
molecule-podman molecule-plugins

4
requirements.yml Normal file
View File

@ -0,0 +1,4 @@
---
collections:
- name: community.mysql
- name: containers.podman