From 92e30ec9ac3828f69410fd6458ef4d62e6b8a860 Mon Sep 17 00:00:00 2001 From: Alejandro Blanco Lopez Date: Fri, 20 Aug 2021 15:21:51 +0200 Subject: [PATCH 1/3] #79 add molecule-docker support --- CHANGELOG.md | 3 +++ cookiecutter.json | 1 + {{cookiecutter.app_name}}_role/test-requirements.txt | 1 + 3 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c260c1c..9c25f06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## Unreleased +### Added +- *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add molecule-docker support* @blalop + ## [2.7.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.7.0) ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.6.1...2.7.0) ### Added diff --git a/cookiecutter.json b/cookiecutter.json index c5e397e..1d3ac3b 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -10,6 +10,7 @@ "ansible_version": "", "molecule_version": "", "python_docker_version": "", + "molecule_docker_version": "", "ansible_lint_version":"", "license":"Apache 2.0", "galaxy_tag_1":"example_tag1", diff --git a/{{cookiecutter.app_name}}_role/test-requirements.txt b/{{cookiecutter.app_name}}_role/test-requirements.txt index c30c500..fd772c1 100644 --- a/{{cookiecutter.app_name}}_role/test-requirements.txt +++ b/{{cookiecutter.app_name}}_role/test-requirements.txt @@ -1,4 +1,5 @@ ansible=={{ cookiecutter.ansible_version }} molecule=={{ cookiecutter.molecule_version }} docker=={{ cookiecutter.python_docker_version }} +molecule-docker=={{ cookiecutter.molecule_docker_version }} ansible-lint=={{ cookiecutter.ansible_lint_version }} \ No newline at end of file From ed6eb9ff292149561ac960c9cbf784ee38937e82 Mon Sep 17 00:00:00 2001 From: Alejandro Blanco Lopez Date: Fri, 20 Aug 2021 15:34:03 +0200 Subject: [PATCH 2/3] #79 update testing versions --- test.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 7dd7e65..dfc090a 100755 --- a/test.sh +++ b/test.sh @@ -3,7 +3,22 @@ set -e # Generate role -printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter . --no-input app_name="github_cli" exec_name="gh" author="John Doe" min_ansible_version="2.2" ansible_version="2.8.6" molecule_version="3.0.1" python_docker_version="4.1.0" ansible_lint_version="4.2.0" has_service="False" has_files="False" has_handlers="False" has_templates="False" documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt +printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter . --no-input \ + app_name="github_cli" \ + exec_name="gh" \ + author="John Doe" \ + min_ansible_version="2.2" \ + ansible_version="4.4.0" \ + molecule_version="3.4.0" \ + python_docker_version="5.0.0" \ + molecule_docker_version="0.2.4" \ + ansible_lint_version="5.1.2" \ + has_service="False" \ + has_files="False" \ + has_handlers="False" \ + has_templates="False" \ + documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt + ( # Adjust the role to test cd github_cli_role From 14ae8d9e1443f27e286cd7561eb027123584e882 Mon Sep 17 00:00:00 2001 From: Alejandro Blanco Lopez Date: Mon, 23 Aug 2021 08:48:43 +0200 Subject: [PATCH 3/3] #79 add default pip versions --- CHANGELOG.md | 1 + cookiecutter.json | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c25f06..9a40865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch ## Unreleased ### Added - *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add molecule-docker support* @blalop +- *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add default versions for Python packages* @blalop ## [2.7.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.7.0) ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.6.1...2.7.0) diff --git a/cookiecutter.json b/cookiecutter.json index 1d3ac3b..4ef4152 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -7,11 +7,11 @@ "company": "Idealista S.A.U.", "author": "", "min_ansible_version": "", - "ansible_version": "", - "molecule_version": "", - "python_docker_version": "", - "molecule_docker_version": "", - "ansible_lint_version":"", + "ansible_version": "4.4.0", + "molecule_version": "3.4.0", + "python_docker_version": "5.0.0", + "molecule_docker_version": "0.2.4", + "ansible_lint_version":"5.1.2", "license":"Apache 2.0", "galaxy_tag_1":"example_tag1", "galaxy_tag_2":"example_tag2",