Updated testing matrix and added ansible 2.18 and 2.19 (#36)

* updated testing matrix and added  ansible 2.18 and 2.19

* use py 3.13 for 2.19.5

* adapt for different error handling in ansible 2.19

* test for ansible 2.19 and earlier

* trying things

* use jinja concat instead of embedding templates

* added from_json

* load golden cfg

* use template iso file

* convert to json

* from json

* conditional config_content mapping

* fix conditional for 2.19

* Update galaxy.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* drop 2.15 and set 2.16 as a minimal version

* removing old sanity tests

* remove import/compile-3.5

* added changelog, bumped srl version

* update cfg for 25.10

* peak packet rate for 25.10

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: hellt

.github/container-matrix.yml

@@ -9,25 +9,6 @@
 # python version are taken from ansible's support matrix - https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#support-life
 # ansible-core-image version is taken from https://github.com/orgs/srl-labs/packages?repo_name=ansible-core
 include:
-  # 2.14
-  - ansible-core-image: "2.14.17:pypy3.10"
-    runs-on: "ubuntu-22.04"
-
-  - ansible-core-image: "2.14.17:py3.11"
-    runs-on: "ubuntu-22.04"
-    addional-tags: "latest"
-
-  # 2.15
-  - ansible-core-image: "2.15.12:pypy3.10"
-    runs-on: "ubuntu-22.04"
-
-  - ansible-core-image: "2.15.12:py3.11"
-    runs-on: "ubuntu-22.04"
-
-  - ansible-core-image: "2.15.12:py3.12"
-    runs-on: "ubuntu-22.04"
-    addional-tags: "latest"
-
   # 2.16
   - ansible-core-image: "2.16.8:pypy3.10"
     runs-on: "ubuntu-22.04"

.github/matrix.yml

@@ -7,29 +7,9 @@
 # support matrix for ansible control node - https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#node-requirement-summary
 
 include:
-  ####################
-  # Python 3.9
-  ####################
-  - &latest-2_14
-    ansible-core-version: "2.14.17"
-    runs-on: "ubuntu-22.04"
-    python-version: "3.9"
-
-  - &latest-2_15
-    ansible-core-version: "2.15.12"
-    runs-on: "ubuntu-22.04"
-    python-version: "3.9"
-
   ####################
   # Python 3.10
   ####################
-
-  - <<: *latest-2_14
-    python-version: "3.10"
-
-  - <<: *latest-2_15
-    python-version: "3.10"
-
   - &latest-2_16
     ansible-core-version: "2.16.8"
     runs-on: "ubuntu-22.04"
@@ -43,13 +23,6 @@ include:
   ####################
   # Python 3.11
   ####################
-
-  - <<: *latest-2_14
-    python-version: "3.11"
-
-  - <<: *latest-2_15
-    python-version: "3.11"
-
   - <<: *latest-2_16
     python-version: "3.11"
 
@@ -59,11 +32,18 @@ include:
   ####################
   # Python 3.12
   ####################
-  - <<: *latest-2_15
-    python-version: "3.12"
-
   - <<: *latest-2_16
     python-version: "3.12"
 
   - <<: *latest-2_17
     python-version: "3.12"
+
+  - &latest-2_18
+    ansible-core-version: "2.18.12"
+    runs-on: "ubuntu-24.04"
+    python-version: "3.12"
+
+  - &latest-2_19
+    ansible-core-version: "2.19.5"
+    runs-on: "ubuntu-24.04"
+    python-version: "3.13"

.github/workflows/cicd.yml

@@ -97,7 +97,7 @@ jobs:
           python-version: 3.11
 
       - name: Install ansible core
-        run: pip install ansible-core==2.15.12
+        run: pip install ansible-core==2.16.12
 
       - name: Ansible sanity test
         run: ./run.sh sanity-test

CHANGELOG.md

@@ -28,3 +28,8 @@
 ### Chores
 
 * Removed unused artifacts from the build.
+
+## v1.1.0
+
+* Removed ansible-core 2.15 support, added support for ansible-core 2.18 and 2.19.
+* Removed upper-bound restrictions on `ansible.utils` and `ansible.netcommon` versions.

galaxy.yml

@@ -12,7 +12,7 @@ namespace: nokia
 name: srlinux
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.0.3
+version: 1.1.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -45,10 +45,10 @@ tags:
 # collection label 'namespace.name'. The value is a version range
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
 # range specifiers can be set and are separated by ','
-# fixed dependencies on ansible.netcommon and ansible.utils since newer versions drop support for ansible core 2.14. We can go to the latest version of these deps later
+# Minimum required versions of ansible.netcommon and ansible.utils for this collection.
 dependencies:
-  "ansible.netcommon": ">=5.2.0,<=6.1.3"
-  "ansible.utils": ">=3.0.0,<5.0.0"
+  "ansible.netcommon": ">=5.2.0"
+  "ansible.utils": ">=3.0.0"
 
 # The URL of the originating SCM repository
 repository: https://github.com/nokia/srlinux-ansible-collection

meta/runtime.yml

@@ -1,4 +1,4 @@
-requires_ansible: ">=2.15.0"
+requires_ansible: ">=2.16.0"
 plugin_routing:
   modules:
     srl_config:

pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "srlinux-ansible-collection"
-version = "1.0.1"
+version = "1.1.0"
 description = "SR Linux Ansible Collection"
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = ["ansible-core==2.16.2"]
+dependencies = [
+    "ansible-core==2.16.12",
+ "pyyaml",
+]
 
 [dependency-groups]
-dev = [
-    "rich>=13.9.4",
-    "ruff>=0.9.4",
-]
+dev = ["rich>=13.9.4", "ruff>=0.9.4"]

run.sh

@@ -354,12 +354,12 @@ function ci-test {
   ANSIBLE_CONFIG=ci-ansible.cfg _run-tests "$@"
 }
 
-# copy sanity ignore files from ignore-2.10.txt to all other supported ansible versions
+# copy sanity ignore files from ignore-2.16.txt to all other supported ansible versions
 function copy-sanity-ignore {
   _cdTests
   cd sanity
-  for version in 2.14 2.15 2.16 2.17; do
-    cp ignore-2.10.txt ignore-${version}.txt
+  for version in 2.17 2.18 2.19; do
+    cp ignore-2.16.txt ignore-${version}.txt
   done
 }
 

scripts/topo.clab.yml

@@ -8,5 +8,5 @@ topology:
   nodes:
     srl:
       kind: nokia_srlinux
-      image: ghcr.io/nokia/srlinux:${SRLINUX_VERSION:=24.10.1}
+      image: ghcr.io/nokia/srlinux:${SRLINUX_VERSION:=25.10}
       mgmt-ipv4: 172.20.20.222

tests/playbooks/golden/clab-ansible-srl-golden.cfg.json.j2

@@ -1577,9 +1577,9 @@
             "system-cpu-policer": [
                 {
                     "entry-specific": false,
-                    "max-packet-burst": 1000,
+                    "maximum-burst-packet": 1000,
                     "name": "icmp",
-                    "peak-packet-rate": 1000
+                    "peak-rate-pps": 1000
                 }
             ]
         }