From dfa90c24c9627a7e8d2ced7e7d7e122015428e75 Mon Sep 17 00:00:00 2001
From: Jonas Pammer <opensource@jonaspammer.at>
Date: Mon, 25 Sep 2023 15:29:06 +0200
Subject: [PATCH] feat(ci): add ansible 7, 8 to test matrix (#151)

---
 .../.github/workflows/ci.yml                   |  5 ++++-
 .../README.orig.adoc                           |  2 ++
 {{ cookiecutter.project_slug }}/tox.ini        | 18 +++++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml
index 700ca26..12616b7 100644
--- a/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml	
+++ b/{{ cookiecutter.project_slug }}/.github/workflows/ci.yml	
@@ -33,11 +33,14 @@ name: CI (Lint + Molecule)
         type: choice
         default: "ansible-6"
         options:
+          - ansible-4,ansible-5,ansible-6,ansible-7,ansible-8
           - ansible-4,ansible-5,ansible-6
-          - ansible-4,ansible-5
+          - ansible-7,ansible-8
           - ansible-4
           - ansible-5
           - ansible-6
+          - ansible-7
+          - ansible-8
   pull_request:
     branches-ignore:
       - renovate/**
diff --git a/{{ cookiecutter.project_slug }}/README.orig.adoc b/{{ cookiecutter.project_slug }}/README.orig.adoc
index 82a8ed1..25efa15 100644
--- a/{{ cookiecutter.project_slug }}/README.orig.adoc	
+++ b/{{ cookiecutter.project_slug }}/README.orig.adoc	
@@ -255,6 +255,8 @@ As of writing this is:
 * 2.11 (Ansible 4)
 * 2.12 (Ansible 5)
 * 2.13 (Ansible 6)
+* 2.14 (Ansible 7)
+* 2.15 (Ansible 8)
 
 
 [[development]]
diff --git a/{{ cookiecutter.project_slug }}/tox.ini b/{{ cookiecutter.project_slug }}/tox.ini
index 3ad9e78..0b19dc5 100644
--- a/{{ cookiecutter.project_slug }}/tox.ini	
+++ b/{{ cookiecutter.project_slug }}/tox.ini	
@@ -7,7 +7,7 @@ extend-ignore = E203
 ### Ansible Testing through Molecule ###
 [tox]
 minversion = 4.1.2
-envlist = pre-commit,py{3}-ansible-{4,5,6}
+envlist = pre-commit,py{3}-ansible-{4,5,6,7,8}
 
 skipsdist = true
 
@@ -15,16 +15,20 @@ skipsdist = true
 passenv = *
 parallel_show_output = True
 deps =
-    ansible-4: ansible == 4.* # core 2.11 + https://github.com/ansible-community/ansible-build-data/blob/main/4/ansible-4.build
-    ansible-5: ansible == 5.* # core 2.12 + https://github.com/ansible-community/ansible-build-data/blob/main/5/ansible-5.build
-    ansible-6: ansible == 6.* # core 2.13 + https://github.com/ansible-community/ansible-build-data/blob/main/6/ansible-6.build
+    # For information on what included in the the "ansible" package,
+    # see https://github.com/ansible-community/ansible-build-data/blob/main/ (e.g. `/5/ansible-5.build`).
+    ansible-4: ansible == 4.* # core 2.11
+    ansible-5: ansible == 5.* # core 2.12
+    ansible-6: ansible == 6.* # core 2.13
+    ansible-7: ansible == 7.* # core 2.14
+    ansible-8: ansible == 8.* # core 2.15
     ansible-4: molecule == 4.*
-    ansible-{5,6}: molecule == 5.* # molecule v5.0.0 requires ansible-core>=2.12
+    ansible-!4: molecule >= 5 # molecule v5.0.0 requires ansible-core>=2.12
     ansible-4: molecule-plugins[docker] == 22.*
-    ansible-{5,6}: molecule-plugins[docker] == 23.* # molecule-plugins v23.4.0 requires ansible-core>=2.12
+    ansible-!4: molecule-plugins[docker] >= 23 # molecule-plugins v23.4.0 requires ansible-core>=2.12
     paramiko == 3.*
     ansible-4: ansible-lint == 5.*
-    ansible-{5,6}: ansible-lint == 6.* # ansible-lint 6 made ansible 2.12+ a direct dependency
+    ansible-!4: ansible-lint >= 6 # ansible-lint 6 made ansible 2.12+ a direct dependency
 commands =
     ansible --version
     molecule destroy