From e0aeb9622d82644e46518a97afbd7212bf89e6d3 Mon Sep 17 00:00:00 2001
From: Roman Dodin <dodin.roman@gmail.com>
Date: Fri, 27 Oct 2023 14:49:56 +0200
Subject: [PATCH] Updating test and container build workflows (#21)

* testing anchor defaults

* scope out matrix defaults

* embed anchors

* remove global defaults

* use anchors and add py 3.12

* update srl to 23.7.2

* fixing supported combinations

* added 2.15.5 for image build
---
 .github/container-matrix.yml | 24 ++++++-----
 .github/matrix.yml           | 82 +++++++++++++++++++++++++++---------
 scripts/topo.clab.yml        |  2 +-
 3 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/.github/container-matrix.yml b/.github/container-matrix.yml
index c5ce59a..75d6ade 100644
--- a/.github/container-matrix.yml
+++ b/.github/container-matrix.yml
@@ -5,21 +5,23 @@
 # a matrix list of variables used in the container build process
 #
 # 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.10
-  - ansible-core-image: "2.14.10:pypy3.10"
+  # 2.14.11
+  - ansible-core-image: "2.14.11:pypy3.10"
     runs-on: "ubuntu-22.04"
 
-  - ansible-core-image: "2.14.10:py3.11"
+  - ansible-core-image: "2.14.11:py3.11"
     runs-on: "ubuntu-22.04"
     addional-tags: "latest"
 
-  # 2.15.4
-  # - base-image: "pypy:3.10-slim"
-  #   ansible-core-version: "2.15.4"
-  #   runs-on: "ubuntu-22.04"
+  # 2.15.5
+  - ansible-core-image: "2.15.5:pypy3.10"
+    runs-on: "ubuntu-22.04"
 
-  # - base-image: "python:3.11-slim"
-  #   ansible-core-version: "2.15.4"
-  #   runs-on: "ubuntu-22.04"
-  #   addional-tags: "latest"
+  - ansible-core-image: "2.15.5:py3.11"
+    runs-on: "ubuntu-22.04"
+    addional-tags: "latest"
+
+  - ansible-core-image: "2.15.5:py3.12"
+    runs-on: "ubuntu-22.04"
diff --git a/.github/matrix.yml b/.github/matrix.yml
index b72a656..7b7fa0e 100644
--- a/.github/matrix.yml
+++ b/.github/matrix.yml
@@ -5,33 +5,77 @@
 # a matrix list of variables used in testing
 # kind of a manual way of creating a testing matrix with a flexibility of selecting permuatations
 # support matrix for ansible control node - https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#node-requirement-summary
+
 include:
+  ####################
   # Python 3.8
-  - python-version: "3.8"
+  ####################
+  - &latest-2_12
     ansible-core-version: "2.12.10"
     runs-on: "ubuntu-22.04"
-  - python-version: "3.8"
-    ansible-core-version: "2.13.8"
+    python-version: "3.8"
+
+  - &latest-2_13
+    ansible-core-version: "2.13.13"
     runs-on: "ubuntu-22.04"
+    python-version: "3.8"
 
+  ####################
   # Python 3.9
-  - python-version: "3.9"
-    ansible-core-version: "2.12.10"
-    runs-on: "ubuntu-22.04"
-  - python-version: "3.9"
-    ansible-core-version: "2.13.8"
+  ####################
+  - <<: *latest-2_12
+    python-version: "3.9"
+
+  - <<: *latest-2_13
+    python-version: "3.9"
+
+  - &latest-2_14
+    ansible-core-version: "2.14.11"
     runs-on: "ubuntu-22.04"
-  - python-version: "3.9"
-    ansible-core-version: "2.14.3"
+    python-version: "3.9"
+
+  - &latest-2_15
+    ansible-core-version: "2.15.5"
     runs-on: "ubuntu-22.04"
+    python-version: "3.9"
 
+  ####################
   # Python 3.10
-  - python-version: "3.9"
-    ansible-core-version: "2.12.10"
-    runs-on: "ubuntu-22.04"
-  - python-version: "3.9"
-    ansible-core-version: "2.13.8"
-    runs-on: "ubuntu-22.04"
-  - python-version: "3.9"
-    ansible-core-version: "2.14.3"
-    runs-on: "ubuntu-22.04"
+  ####################
+
+  # removing 2_12 and 2_13 because TLS tests are failing
+  # this doesn't make the collection unusable with these versions
+  # when 23.10 comes out with TLS 1.3 we will remove these checks and bring back 2_12 and 2_13
+  # - <<: *latest-2_12
+  #   python-version: "3.10"
+
+  # - <<: *latest-2_13
+  #   python-version: "3.10"
+
+  - <<: *latest-2_14
+    python-version: "3.10"
+
+  - <<: *latest-2_15
+    python-version: "3.10"
+
+  ####################
+  # Python 3.11
+  ####################
+
+  # - <<: *latest-2_12
+  #   python-version: "3.11"
+
+  # - <<: *latest-2_13
+  #   python-version: "3.11"
+
+  - <<: *latest-2_14
+    python-version: "3.11"
+
+  - <<: *latest-2_15
+    python-version: "3.11"
+
+  ####################
+  # Python 3.12
+  ####################
+  - <<: *latest-2_15
+    python-version: "3.12"
diff --git a/scripts/topo.clab.yml b/scripts/topo.clab.yml
index 28fde33..7efe178 100644
--- a/scripts/topo.clab.yml
+++ b/scripts/topo.clab.yml
@@ -8,7 +8,7 @@ topology:
   nodes:
     srl:
       kind: srl
-      image: ghcr.io/nokia/srlinux:${SRLINUX_VERSION:=23.3.2}
+      image: ghcr.io/nokia/srlinux:${SRLINUX_VERSION:=23.7.2}
       # type and startup config are used to test Openconfig modules
       type: ixr6
       startup-config: oc.cfg