From 2a12cea561d0c7641c1b3372659c40ea64fa912c Mon Sep 17 00:00:00 2001 From: doobry Date: Thu, 3 Aug 2023 15:04:54 +0200 Subject: [PATCH 1/3] Add debian12 support, remove debian10 --- .github/workflows/main.yml | 2 +- meta/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f9426f..a402f68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,4 +20,4 @@ jobs: uses: systemli/github-ansible-workflow/.github/workflows/ansible-integration-workflow.yaml@v1.2.0 with: disable-apparmor-mysql: true - distros: '[ "debian11", "debian10" ]' + distros: '[ "debian12", "debian11" ]' diff --git a/meta/main.yml b/meta/main.yml index a65cd05..12da924 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,5 +12,5 @@ galaxy_info: - name: Debian versions: - stretch - - buster - bullseye + - bookworm From 2fc65692a650b0d9145996e9ba6e1799f63e2ce2 Mon Sep 17 00:00:00 2001 From: doobry Date: Thu, 3 Aug 2023 15:07:21 +0200 Subject: [PATCH 2/3] Remove obsolete Debian release checks from Ansible tasks We no longer support Debian <= 10. --- tasks/main.yml | 14 ++------------ tasks/munin.yml | 1 - 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index b70c663..2203400 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,9 +1,4 @@ --- -- name: Set Ansible Python interpreter - ansible.builtin.set_fact: - ansible_python_interpreter: /usr/bin/python3 - when: ansible_distribution_major_version | int == 10 - - name: Install MariaDB client + server ansible.builtin.apt: pkg: "{{ mariadb_packages }}" @@ -11,11 +6,6 @@ update_cache: true notify: Remove MariaDB test database -- name: Install python-pymysql - ansible.builtin.apt: - pkg: python-pymysql - when: ansible_distribution_major_version | int <= 9 - - name: Optionally install automysqlbackup ansible.builtin.apt: pkg: "automysqlbackup" @@ -26,7 +16,7 @@ ansible.builtin.apt: pkg: "mariadb-backup" state: present - when: mariadb_backup and ansible_distribution_major_version | int >= 10 + when: mariadb_backup - name: Start MariaDB ansible.builtin.service: @@ -53,7 +43,7 @@ mode: "0644" tags: - role:mariadb:config - when: mariadb_backup and ansible_distribution_major_version | int >= 10 + when: mariadb_backup - name: Ensure databases are present community.mysql.mysql_db: diff --git a/tasks/munin.yml b/tasks/munin.yml index 22fb7e3..99a757b 100644 --- a/tasks/munin.yml +++ b/tasks/munin.yml @@ -3,7 +3,6 @@ ansible.builtin.apt: name: munin-plugins-core state: present - default_release: "{{ 'stretch-backports' if ansible_distribution_release == 'stretch' else omit }}" - name: Ensure munin perl packages are installed ansible.builtin.apt: From 8cd42647494a974926d36cf8630f8055742bcb25 Mon Sep 17 00:00:00 2001 From: doobry Date: Thu, 3 Aug 2023 15:41:25 +0200 Subject: [PATCH 3/3] Run molecule tests on Debian Bookworm Also add `--diff` as ansible option to molecule config. --- molecule/default/molecule.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 10a809b..8f9b874 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -5,8 +5,8 @@ driver: name: virtualbox platforms: - - name: bullseye64 - box: debian/bullseye64 + - name: bookworm64 + box: debian/bookworm64 lint: | set -e @@ -15,4 +15,6 @@ lint: | provisioner: name: ansible + ansible_args: + - --diff become: true