rename validate handler

bodsch · Aug 19, 2024 · 1f976f7 · 1f976f7
1 parent b9b9ee5
commit 1f976f7
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/configured.yml b/.github/workflows/configured.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   debian:
-    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python }}"
+    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python_version }}"
     runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'schedule' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
@@ -66,7 +66,7 @@ jobs:
             -e DISTRIBUTION="${{ matrix.image }}"
 
   ubuntu:
-    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python }}"
+    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python_version }}"
     runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'schedule' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
@@ -113,7 +113,7 @@ jobs:
             -e DISTRIBUTION="${{ matrix.image }}"
 
   scenarios:
-    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python }}"
+    name: "${{ matrix.scenario }} / ${{ matrix.image }}, ansible ${{ matrix.ansible-version }}, python ${{ matrix.python_version }}"
     runs-on: ubuntu-22.04
     needs:
       - debian

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   arch:
-    name: "${{ matrix.image }} / ansible ${{ matrix.ansible-version }} / python ${{ matrix.python }}"
+    name: "${{ matrix.image }} / ansible ${{ matrix.ansible-version }} / python ${{ matrix.python_version }}"
     runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'schedule' || github.event.workflow_run.conclusion == 'success' }}
     strategy:

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 #
 export TOX_SCENARIO  ?= default
-export TOX_ANSIBLE   ?= ansible_6.1
+export TOX_ANSIBLE   ?= ansible_8.5
 
 .PHONY: converge destroy verify test lint
 

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -12,7 +12,7 @@
     name: glauth
     state: reloaded
 
-- name: validate config  # noqa no-changed-when
+- name: validate glauth config  # noqa no-changed-when
   ansible.builtin.command: |
     glauth --check-config -c {{ glauth_config_dir }}/glauth.conf
   when:

diff --git a/molecule/2.x/molecule.yml b/molecule/2.x/molecule.yml
@@ -46,7 +46,6 @@ provisioner:
 
 scenario:
   test_sequence:
-    # - lint
     - destroy
     - dependency
     - syntax

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -40,6 +40,12 @@
       ansible.builtin.package:
         update_cache: true
 
+    - name: install dependencies
+      ansible.builtin.package:
+        name:
+          - iproute2
+        state: present
+
     - name: environment
       ansible.builtin.debug:
         msg:

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -2,10 +2,9 @@ ansible-lint
 docker
 dnspython
 flake8
-molecule>=5.0.1
+molecule
 molecule-plugins[docker]
 netaddr
-pytest
 pytest-testinfra
 tox
 tox-gh-actions

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
+ignore_basepython_conflict = True
+skip_missing_interpreters = True
+
 minversion = 3.25
 toxworkdir = /tmp/.tox/
 
-envlist = ansible_{2.9,2.10,3.4,4.10,5.1,5.2,6.1}
-
 skipsdist = true
 
 [testenv]
@@ -26,6 +27,9 @@ deps =
     ansible_7.5: ansible>=7.5,<7.6
     ansible_8.0: ansible>=8.0,<8.1
     ansible_8.5: ansible>=8.5,<8.6
+    ansible_9.0: ansible>=9.0,<9.1
+    ansible_9.5: ansible>=9.5,<9.6
+    ansible_10.0: ansible>=10.0,<10.1
 
 #commands_pre =
 #    /usr/bin/find {toxinidir} -type f -not -path '{toxworkdir}/*' -path '*/__pycache__/*' -name '*.py[c|o]' -delete