diff --git a/.travis.yml b/.travis.yml index a709d07..580ae30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- dist: focal language: python -python: "3.9" +python: "3.10" os: linux services: - docker @@ -20,3 +20,4 @@ notifications: on_failure: always recipients: - desarrollo.benders@idealista.com + diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ccfdb9..764a454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ 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 +### Changed +- *Improve README init scrips to avoid errors when create two roles on same path because already pipenv exists.* @adrian-arapiles +- *Change travis.yml order of email notification as documentation explains.* @adrian-arapiles +- *Add first line `---` to ansible-lint file because it's a yml.* @adrian-arapiles +### Fixed +- *[92](https://github.com/idealista/cookiecutter-ansible-role/issues/92) Fix meta.yml lint warning from `galaxy-tags` to `galaxy_tags`.* @adrian-arapiles + ## [2.9.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.9.0) ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.8.1...2.9.0) ### Changed diff --git a/README.md b/README.md index ac95f8f..a69ec92 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,8 @@ You just need to have [pipenv](https://github.com/pypa/pipenv) installed. ## Usage -To generate your ansible role type ```printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter https://github.com/idealista/cookiecutter-ansible-role && rm Pipfile* requirements.txt```. +To generate your ansible role type ```printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter https://github.com/idealista/cookiecutter-ansible-role && rm -rf Pipfile* +requirements.txt && pipenv --rm && rm -rf requirements.txt```. Then, introduce some parameters needed for generating it. @@ -45,9 +46,11 @@ company [Idealista S.A.U.]: author []: pablogcaldito min_ansible_version []: 2.2 ansible_version []: 5.2.0 -molecule_version []: 3.0.1 -python_docker_version []: 4.1.0 +molecule_version []: 3.4.0 +python_docker_version []: 5.0.0 +molecule_docker_version []: 0.2.4 ansible_lint_version []: 5.3.2 +yamllint_version []: 1.28.0 license [Apache 2.0]: galaxy_tag_1 [example_tag1]: github_cli galaxy_tag_2 [example_tag2]: github diff --git a/cookiecutter.json b/cookiecutter.json index 8a5240c..6013775 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -12,10 +12,11 @@ "python_docker_version": "5.0.0", "molecule_docker_version": "0.2.4", "ansible_lint_version":"5.3.2", + "yamllint_version": "1.28.0", "license":"Apache 2.0", - "galaxy_tag_1":"example_tag1", - "galaxy_tag_2":"example_tag2", - "galaxy_tag_3":"example_tag3", + "galaxy_tag_1":"tag1", + "galaxy_tag_2":"tag2", + "galaxy_tag_3":"tag3", "debian_bullseye_support":["True", "False"], "debian_buster_support":["True", "False"], "has_service":["True", "False"], diff --git a/test.sh b/test.sh index 4ab9398..5e31fe5 100755 --- a/test.sh +++ b/test.sh @@ -13,11 +13,12 @@ printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv instal python_docker_version="5.0.0" \ molecule_docker_version="0.2.4" \ ansible_lint_version="5.3.2" \ + yamllint_version="1.28.0" \ has_service="False" \ has_files="False" \ has_handlers="False" \ has_templates="False" \ - documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt + documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt && rm -rf requirements.txt ( # Adjust the role to test diff --git a/{{cookiecutter.app_name}}_role/.ansible-lint b/{{cookiecutter.app_name}}_role/.ansible-lint index 59eca22..355eeac 100644 --- a/{{cookiecutter.app_name}}_role/.ansible-lint +++ b/{{cookiecutter.app_name}}_role/.ansible-lint @@ -1,3 +1,4 @@ +--- exclude_paths: - ./molecule - ./.travis.yml diff --git a/{{cookiecutter.app_name}}_role/meta/main.yml b/{{cookiecutter.app_name}}_role/meta/main.yml index 2bc2c18..03785df 100644 --- a/{{cookiecutter.app_name}}_role/meta/main.yml +++ b/{{cookiecutter.app_name}}_role/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: description: {{ cookiecutter.app_name | replace('_',' ') | title }} Role min_ansible_version: {{ cookiecutter.min_ansible_version }} license: {{ cookiecutter.license }} - galaxy-tags: + galaxy_tags: - {{ cookiecutter.galaxy_tag_1 }} - {{ cookiecutter.galaxy_tag_2 }} - {{ cookiecutter.galaxy_tag_3 }} diff --git a/{{cookiecutter.app_name}}_role/test-requirements.txt b/{{cookiecutter.app_name}}_role/test-requirements.txt index fd772c1..c0440ff 100644 --- a/{{cookiecutter.app_name}}_role/test-requirements.txt +++ b/{{cookiecutter.app_name}}_role/test-requirements.txt @@ -2,4 +2,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 +ansible-lint=={{ cookiecutter.ansible_lint_version }} +yamllint=={{ cookiecutter.yamllint_version }} \ No newline at end of file