From b33689d3b559afdbabad2f395b91b7dc5a8caa01 Mon Sep 17 00:00:00 2001 From: santi-eidu Date: Wed, 23 Mar 2022 16:11:42 +0100 Subject: [PATCH] #86 Change debian supported version stretch to bulleye --- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 2 +- cookiecutter.json | 2 +- {{cookiecutter.app_name}}_role/README.md | 2 +- {{cookiecutter.app_name}}_role/meta/main.yml | 2 +- {{cookiecutter.app_name}}_role/molecule/default/Dockerfile.j2 | 2 +- {{cookiecutter.app_name}}_role/molecule/default/molecule.yml | 2 +- .../{% raw %}.travis.yml{% endraw %} | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6522ad7..6894123 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - pip3 install cookiecutter env: jobs: - - MOLECULE_DISTRO=debian:stretch-slim + - MOLECULE_DISTRO=debian:bullseye-slim - MOLECULE_DISTRO=debian:buster-slim script: - ./test.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd222b..e412f4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ 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 +## [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 +- *[#86](https://github.com/idealista/cookiecutter-ansible-role/issues/86) Upgrade molecule config to test under debian bullseye #86* @sperez ## [2.8.1](https://github.com/idealista/cookiecutter-ansible-role/tree/2.8.1) ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.8.0...2.8.1) ### Fixed diff --git a/README.md b/README.md index 8086ff9..b14d5b4 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ 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_stretch_support: +Select debian_bullseye_support: 1 - True 2 - False Choose from 1, 2 [1]: diff --git a/cookiecutter.json b/cookiecutter.json index 4ef4152..3c9c9c3 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -16,7 +16,7 @@ "galaxy_tag_1":"example_tag1", "galaxy_tag_2":"example_tag2", "galaxy_tag_3":"example_tag3", - "debian_stretch_support":["True", "False"], + "debian_bullseye_support":["True", "False"], "debian_buster_support":["True", "False"], "has_service":["True", "False"], "has_files":["True", "False"], diff --git a/{{cookiecutter.app_name}}_role/README.md b/{{cookiecutter.app_name}}_role/README.md index 7119d7f..8a9e67c 100644 --- a/{{cookiecutter.app_name}}_role/README.md +++ b/{{cookiecutter.app_name}}_role/README.md @@ -7,7 +7,7 @@ This ansible role installs {% if cookiecutter.documentation_URL != "" %}[{% endif %}{{ cookiecutter.app_name | replace('_',' ') | title }}{% if cookiecutter.documentation_URL != "" %}]({{ cookiecutter.documentation_URL }}){% endif %} in a Debian environment. It has been tested for the following Debian versions: -{% if cookiecutter.debian_stretch_support == 'True' %}* Stretch{% endif %} +{% if cookiecutter.debian_bullseye_support == 'True' %}* Bulleye{% 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 b5a9c5e..2bc2c18 100644 --- a/{{cookiecutter.app_name}}_role/meta/main.yml +++ b/{{cookiecutter.app_name}}_role/meta/main.yml @@ -13,5 +13,5 @@ galaxy_info: platforms: - name: Debian versions: - {% if cookiecutter.debian_stretch_support == 'True' %}- stretch{% endif %} + {% if cookiecutter.debian_bullseye_support == 'True' %}- bullseye{% endif %} {% if cookiecutter.debian_buster_support == 'True' %}- buster{% endif %} diff --git a/{{cookiecutter.app_name}}_role/molecule/default/Dockerfile.j2 b/{{cookiecutter.app_name}}_role/molecule/default/Dockerfile.j2 index c4dbd4e..c210902 100644 --- a/{{cookiecutter.app_name}}_role/molecule/default/Dockerfile.j2 +++ b/{{cookiecutter.app_name}}_role/molecule/default/Dockerfile.j2 @@ -8,5 +8,5 @@ FROM {{ item.image }} # install minimal packages for debian slim images RUN apt-get update && \ - apt-get install -y python sudo bash ca-certificates iproute2 systemd systemd-sysv python-pip && \ + apt-get install -y python sudo bash ca-certificates iproute2 systemd systemd-sysv python3-pip && \ apt-get clean{% endraw %} diff --git a/{{cookiecutter.app_name}}_role/molecule/default/molecule.yml b/{{cookiecutter.app_name}}_role/molecule/default/molecule.yml index b3da2fb..83c6550 100644 --- a/{{cookiecutter.app_name}}_role/molecule/default/molecule.yml +++ b/{{cookiecutter.app_name}}_role/molecule/default/molecule.yml @@ -10,7 +10,7 @@ platforms: - name: {{ cookiecutter.app_name }} groups: - {{ cookiecutter.app_name }}_group - image: ${MOLECULE_DISTRO:-debian:buster-slim} + image: ${MOLECULE_DISTRO:-debian:bullseye-slim} privileged: false capabilities: - SYS_ADMIN diff --git a/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} b/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} index eb97830..190df8b 100644 --- a/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} +++ b/{{cookiecutter.app_name}}_role/{% raw %}.travis.yml{% endraw %} @@ -10,8 +10,8 @@ install: - pipenv sync env: jobs: - {% if cookiecutter.debian_stretch_support == 'True' %}- MOLECULE_DISTRO=debian:stretch-slim{% endif %} {% if cookiecutter.debian_buster_support == 'True' %}- MOLECULE_DISTRO=debian:buster-slim{% endif %} + {% if cookiecutter.debian_bullseye_support == 'True' %}- MOLECULE_DISTRO=debian:bullseye-slim{% endif %} script: - pipenv run molecule test --all