diff --git a/.travis.yml b/.travis.yml index 2aaba44..d87c80f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ install: - pip3 install cookiecutter env: jobs: - - MOLECULE_DISTRO=debian:jessie-slim - MOLECULE_DISTRO=debian:stretch-slim - MOLECULE_DISTRO=debian:buster-slim diff --git a/CHANGELOG.md b/CHANGELOG.md index 17b4a57..618b6f0 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 +### Removed +- *[#16](https://github.com/idealista/cookiecutter-ansible-role/issues/16) Remove debian jessie support* @pablogcaldito + ### Added - * Add boilerplate README.md* @vicsufer diff --git a/README.md b/README.md index 1044cb4..fec81c2 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,6 @@ license [Apache 2.0]: galaxy_tag_1 [example_tag1]: github_cli galaxy_tag_2 [example_tag2]: github galaxy_tag_3 [example_tag3]: cli -Select debian_jessie_support: -1 - True -2 - False -Choose from 1, 2 [1]: Select debian_stretch_support: 1 - True 2 - False diff --git a/cookiecutter.json b/cookiecutter.json index 7d6c93e..d82c50d 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -15,7 +15,6 @@ "galaxy_tag_1":"example_tag1", "galaxy_tag_2":"example_tag2", "galaxy_tag_3":"example_tag3", - "debian_jessie_support":["True", "False"], "debian_stretch_support":["True", "False"], "debian_buster_support":["True", "False"], "has_service":["True", "False"], diff --git a/{{cookiecutter.app_name}}_role/README.md b/{{cookiecutter.app_name}}_role/README.md index 77bdf94..64ce241 100644 --- a/{{cookiecutter.app_name}}_role/README.md +++ b/{{cookiecutter.app_name}}_role/README.md @@ -6,7 +6,9 @@ -This ansible role installs [{{ cookiecutter.app_name | replace('_',' ') | title }}](APP_URL_HERE) in a Debian environment. It has been tested for Debian buster and stretch. +This ansible role installs [{{ cookiecutter.app_name | replace('_',' ') | title }}](APP_URL_HERE) in a Debian environment. It has been tested for the following Debian versions: +{% if cookiecutter.debian_stretch_support == 'True' %}* Stretch{% endif %} +{% if cookiecutter.debian_buster_support == 'True' %}* Buster{% endif %} This role has been generated using the [cookiecutter](https://github.com/cookiecutter/cookiecutter) tool, you can generate a similar role that fits your needs using the this [cookiecutter template](https://github.com/idealista/cookiecutter-ansible-role). diff --git a/{{cookiecutter.app_name}}_role/meta/main.yml b/{{cookiecutter.app_name}}_role/meta/main.yml index 89df173..b5a9c5e 100644 --- a/{{cookiecutter.app_name}}_role/meta/main.yml +++ b/{{cookiecutter.app_name}}_role/meta/main.yml @@ -13,6 +13,5 @@ galaxy_info: platforms: - name: Debian versions: - {% if cookiecutter.debian_jessie_support == 'True' %}- jessie{% endif %} {% if cookiecutter.debian_stretch_support == 'True' %}- stretch{% endif %} {% if cookiecutter.debian_buster_support == 'True' %}- buster{% endif %} diff --git a/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} b/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} index 0f516cc..1d4aa00 100644 --- a/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} +++ b/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} @@ -10,7 +10,6 @@ install: - pipenv sync env: jobs: - {% if cookiecutter.debian_jessie_support == 'True' %}- MOLECULE_DISTRO=debian:jessie-slim{% endif %} {% if cookiecutter.debian_stretch_support == 'True' %}- MOLECULE_DISTRO=debian:stretch-slim{% endif %} {% if cookiecutter.debian_buster_support == 'True' %}- MOLECULE_DISTRO=debian:buster-slim{% endif %} script: