From 2a375f9f81444098714a3fbcb9217bb09007f31a Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Tue, 27 Feb 2024 18:15:58 +0100
Subject: [PATCH] Add tests of more modern distros

Buster goes EOL in June 2024, so it's good time to add testing of more
distros, including latest Debian 12 and Ubuntu 22.04 as latest LTS at
the moment.

Change-Id: I62dafeef2e2483631cabb10e8f2c289dfb726bea
---
 .zuul.yaml                   | 34 ++++++++++++++++++++++++++++------
 molecule/default/prepare.yml |  4 ++++
 tox.ini                      | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 221a38b..5af297b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,12 +1,12 @@
 ---
 
 - nodeset:
-    name: debian-buster-2-node
+    name: debian-bookworm-2-node
     nodes:
       - name: primary
-        label: debian-buster
+        label: debian-bookworm
       - name: secondary
-        label: debian-buster
+        label: debian-bookworm
     groups:
       - name: switch
         nodes:
@@ -20,16 +20,38 @@
     name: ffrouting-deploy
     parent: base
     run: tests/test.yml
-    nodeset: debian-buster-2-node
+    nodeset: debian-bookworm-2-node
+
+- job:
+    name: tox-molecule-buster
+    parent: tox-molecule
+    vars:
+      tox_envlist: molecule-buster
+
+- job:
+    name: tox-molecule-bookworm
+    parent: tox-molecule
+    vars:
+      tox_envlist: molecule-bookworm
+
+- job:
+    name: tox-molecule-jammy
+    parent: tox-molecule
+    vars:
+      tox_envlist: molecule-jammy
 
 - project:
     check:
       jobs:
         - ffrouting-deploy
         - tox-linters
-        - tox-molecule
+        - tox-molecule-buster
+        - tox-molecule-bookworm
+        - tox-molecule-jammy
     gate:
       jobs:
         - ffrouting-deploy
         - tox-linters
-        - tox-molecule
+        - tox-molecule-buster
+        - tox-molecule-bookworm
+        - tox-molecule-jammy
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index bca2b2e..2262e37 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -6,6 +6,9 @@
     iproute_package_name:
       redhat: iproute
       debian: iproute2
+    iputils_package_name:
+      redhat: iputils
+      debian: iputils-ping
   tasks:
     - name: Install required packages
       package:
@@ -15,6 +18,7 @@
       with_items:
         - ca-certificates
         - "{{ iproute_package_name[ansible_facts['os_family'] | lower] }}"
+        - "{{ iputils_package_name[ansible_facts['os_family'] | lower] }}"
 
     - name: Clear gathered facts
       meta: clear_facts
diff --git a/tox.ini b/tox.ini
index 633ebe7..ec5078f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,11 +40,43 @@ commands =
     ansible-lint {toxinidir}/molecule/default/playbook.yml
     yamllint {toxinidir}
 
-[testenv:molecule]
+
+[molecule]
 deps =
     {[testenv]deps}
     docker
     molecule
     molecule-plugins[docker]
+
 commands =
     molecule test
+
+setenv =
+    {[testenv]setenv}
+
+[testenv:molecule-buster]
+deps =
+    {[molecule]deps}
+commands =
+    {[molecule]commands}
+setenv =
+    {[molecule]setenv}
+    docker_image_tag=debian-systemd:buster
+
+[testenv:molecule-bookworm]
+deps =
+    {[molecule]deps}
+commands =
+    {[molecule]commands}
+setenv =
+    {[molecule]setenv}
+    docker_image_tag=debian-systemd:bookworm
+
+[testenv:molecule-jammy]
+deps =
+    {[molecule]deps}
+commands =
+    {[molecule]commands}
+setenv =
+    {[molecule]setenv}
+    docker_image_tag=ubuntu-systemd:jammy