New Testing Ideas

.ansible-lint

@@ -9,6 +9,7 @@ exclude_paths:
   - .vagrant/
   - changelogs/
   - docs/
+
 # parseable: true
 # quiet: true
 # verbosity: 1
@@ -31,7 +32,7 @@ exclude_paths:
 # requirements, like avoiding python identifiers. To disable add `var-naming`
 # to skip_list.
 # var_naming_pattern: "^[a-z_][a-z0-9_]*$"
-var_naming_pattern: "^checkmk_(server|agent|var)_.*$"
+var_naming_pattern: "^(__)?checkmk_(server|agent|var)_.*$"
 
 use_default_rules: true
 # Load custom rules from this specific folder
@@ -74,7 +75,8 @@ skip_list:
 #   - all
 
 # Offline mode disables installation of requirements.yml
-offline: true
+# offline: true
+offline: false
 
 # # Define required Ansible's variables to satisfy syntax check
 # extra_vars:

.envrc

@@ -0,0 +1,19 @@
+# -*- mode: sh -*-
+
+layout_python() {
+    if [[ -d ".venv" ]]; then
+        VIRTUAL_ENV="$(pwd)/.venv"
+    fi
+
+    if [[ -z $VIRTUAL_ENV || ! -d $VIRTUAL_ENV ]]; then
+        log_status "No virtual environment exists. Creating it."
+        uv venv
+        uv pip install -r requirements.txt
+        VIRTUAL_ENV="$(pwd)/.venv"
+    fi
+
+    # Activate the virtual environment
+    . $VIRTUAL_ENV/bin/activate
+}
+
+layout python

.github/dependabot.yml

@@ -1,5 +1,12 @@
 version: 2
 updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "05:00"
+    target-branch: "devel"
+    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/labels-issues.yml

@@ -11,6 +11,9 @@ role:server:
 role:agent:
   - 'Component Name: agent'
 
+inventory:
+  - 'Component Name: inventory'
+
 module:activation:
   - 'Component Name: activation'
 
@@ -44,6 +47,9 @@ module:rule:
 module:service_group:
   - 'Component Name: service_group'
 
+module:site:
+  - 'Component Name: site'
+
 module:tag_group:
   - 'Component Name: tag_group'
 
@@ -53,8 +59,8 @@ module:timeperiod:
 module:user:
   - 'Component Name: user'
 
-lookup:version:
-  - 'Component Name: lookup_version'
+lookup:bakery:
+  - 'Component Name: lookup_bakery'
 
 lookup:folder:
   - 'Component Name: lookup_folder'
@@ -80,5 +86,11 @@ lookup:ruleset:
 lookup:rulesets:
   - 'Component Name: lookup_rulesets'
 
-lookup:bakery:
-  - 'Component Name: lookup_bakery'
+lookup:site:
+  - 'Component Name: lookup_site'
+
+lookup:sites:
+  - 'Component Name: lookup_sites'
+
+lookup:version:
+  - 'Component Name: lookup_version'

.github/labels-prs.yml

@@ -14,6 +14,11 @@ role:agent:
       - changed-files:
           - any-glob-to-any-file: 'roles/agent/*'
 
+inventory:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: 'plugins/inventory/checkmk.py'
+
 module:activation:
   - any:
       - changed-files:
@@ -69,6 +74,11 @@ module:service_group:
       - changed-files:
           - any-glob-to-any-file: 'plugins/modules/service_group.py'
 
+module:site:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: 'plugins/modules/site.py'
+
 module:tag_group:
   - any:
       - changed-files:
@@ -84,10 +94,10 @@ module:user:
       - changed-files:
           - any-glob-to-any-file: 'plugins/modules/user.py'
 
-lookup:version:
+lookup:bakery:
   - any:
       - changed-files:
-          - any-glob-to-any-file: 'plugins/modules/lookup/version.py'
+          - any-glob-to-any-file: 'plugins/modules/lookup/bakery.py'
 
 lookup:folder:
   - any:
@@ -129,7 +139,17 @@ lookup:rulesets:
       - changed-files:
           - any-glob-to-any-file: 'plugins/modules/lookup/rulesets.py'
 
-lookup:bakery:
+lookup:site:
   - any:
       - changed-files:
-          - any-glob-to-any-file: 'plugins/modules/lookup/bakery.py'
+          - any-glob-to-any-file: 'plugins/modules/lookup/site.py'
+
+lookup:sites:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: 'plugins/modules/lookup/sites.py'
+
+lookup:version:
+  - any:
+      - changed-files:
+          - any-glob-to-any-file: 'plugins/modules/lookup/version.py'

.github/workflows/ans-int-test-activation.yaml

@@ -10,6 +10,11 @@ env:
   COLLECTION_NAME: general
   MODULE_NAME: activation
 
+# https://stackoverflow.com/questions/70928424/limit-github-action-workflow-concurrency-on-push-and-pull-request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 name: Ansible Integration Tests for Activation Module
 on:
   workflow_dispatch:
@@ -24,6 +29,7 @@ on:
   push:
     paths:
       - 'plugins/modules/activation.py'
+      - '.github/workflows/ans-int-test-activation.yaml'
 
 jobs:
 
@@ -39,17 +45,52 @@ jobs:
           - stable-2.17
           - devel
         python:
-          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
         exclude:
           # Exclude unsupported sets.
-          - ansible: stable-2.14
-            python: '3.12'
           - ansible: stable-2.15
             python: '3.12'
+          - ansible: stable-2.16
+            python: '3.9'
+          - ansible: stable-2.17
+            python: '3.9'
+          - ansible: devel
+            python: '3.9'
+          - ansible: devel
+            python: '3.10'
+
+    services:
+      ancient_cre:
+        image: checkmk/check-mk-raw:2.1.0p49
+        ports:
+          - 5021:5000
+        env:
+          CMK_SITE_ID: "ancient_cre"
+          CMK_PASSWORD: "Sup3rSec4et!"
+      old_cre:
+        image: checkmk/check-mk-raw:2.2.0p37
+        ports:
+          - 5022:5000
+        env:
+          CMK_SITE_ID: "old_cre"
+          CMK_PASSWORD: "Sup3rSec4et!"
+      stable_cre:
+        image: checkmk/check-mk-raw:2.3.0p23
+        ports:
+          - 5023:5000
+        env:
+          CMK_SITE_ID: "stable_cre"
+          CMK_PASSWORD: "Sup3rSec4et!"
+      stable_cme:
+        image: checkmk/check-mk-managed:2.3.0p23
+        ports:
+          - 5323:5000
+        env:
+          CMK_SITE_ID: "stable_cme"
+          CMK_PASSWORD: "Sup3rSec4et!"
 
     steps:
       - name: Check out code
@@ -60,7 +101,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: ${{ matrix.python }}
 
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@@ -72,5 +113,5 @@ jobs:
           CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
 
       - name: Run integration test
-        run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
+        run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }}
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

.github/workflows/ans-int-test-bakery.yaml

@@ -10,6 +10,10 @@ env:
   COLLECTION_NAME: general
   MODULE_NAME: bakery
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 name: Ansible Integration Tests for Bakery Module
 on:
   workflow_dispatch:
@@ -24,6 +28,7 @@ on:
   push:
     paths:
       - 'plugins/modules/bakery.py'
+      - '.github/workflows/ans-int-test-bakery.yaml'
 
 jobs:
 
@@ -39,17 +44,45 @@ jobs:
           - stable-2.17
           - devel
         python:
-          - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
           - '3.12'
         exclude:
           # Exclude unsupported sets.
-          - ansible: stable-2.14
-            python: '3.12'
           - ansible: stable-2.15
             python: '3.12'
+          - ansible: stable-2.16
+            python: '3.9'
+          - ansible: stable-2.17
+            python: '3.9'
+          - ansible: devel
+            python: '3.9'
+          - ansible: devel
+            python: '3.10'
+
+    services:
+      ancient_cfe:
+        image: checkmk/check-mk-free:2.1.0p49
+        ports:
+          - 5421:5000
+        env:
+          CMK_SITE_ID: "ancient_cfe"
+          CMK_PASSWORD: "Sup3rSec4et!"
+      old_cce:
+        image: checkmk/check-mk-cloud:2.2.0p37
+        ports:
+          - 5222:5000
+        env:
+          CMK_SITE_ID: "old_cce"
+          CMK_PASSWORD: "Sup3rSec4et!"
+      stable_cme:
+        image: checkmk/check-mk-managed:2.3.0p23
+        ports:
+          - 5323:5000
+        env:
+          CMK_SITE_ID: "stable_cme"
+          CMK_PASSWORD: "Sup3rSec4et!"
 
     steps:
       - name: Check out code
@@ -60,7 +93,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: ${{ matrix.python }}
 
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
@@ -72,5 +105,5 @@ jobs:
           CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
 
       - name: Run integration test
-        run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
+        run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }}
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}