From 03cdb3ef31cf36b2be4ccfeb5e7b0bebf694a048 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Thu, 11 Jun 2026 11:34:17 -0400
Subject: [PATCH] Refresh testing matrix

- Refresh list of python versions, the list used is to align it with
  the Ubuntu releases.
- Refresh list of vault versions, the list used is to align it with the
  versions of vault charm published.
- Use Hashicorp's vault image

Signed-off-by: Felipe Reyes <felipe.reyes@canonical.com>
---
 .github/workflows/testing.yml | 41 ++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 240bd5e..4abdb6a 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -9,17 +9,38 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        python_versions:
-          - '3.6'
-          - '3.7'
+        include:
+          - python_version: '3.8'
+            os: "ubuntu-20.04"
+            openstack_constraints: 'https://opendev.org/openstack/requirements/raw/tag/ussuri-eol/upper-constraints.txt'
+          - python_version: '3.10'
+            os: "ubuntu-22.04"
+            openstack_constraints: 'https://opendev.org/openstack/requirements/raw/tag/yoga-eom/upper-constraints.txt'
+          - python_version: '3.12'
+            os: "ubuntu-24.04"
+            openstack_constraints: 'https://opendev.org/openstack/requirements/raw/branch/stable/2024.1/upper-constraints.txt'
+          - python_version: '3.14'
+            os: "ubuntu-26.04"
+            openstack_constraints: 'https://opendev.org/openstack/requirements/raw/branch/stable/2026.1/upper-constraints.txt'
+        python_version:
           - '3.8'
-        vault_versions:
-          - '1.7.3'
-          - '1.1.5'
-    runs-on: ubuntu-latest
+          - '3.10'
+          - '3.12'
+          - '3.14'
+        vault_version:
+          # k8s based vault
+          - '2.0'
+          - '1.19'
+          - '1.18'
+          - '1.17'
+          - '1.16'
+          - '1.15'
+          # charmed openstack's vault
+          - '1.8'
+    runs-on: ${{ matrix.os }}
     services:
       vault:
-        image: vault:${{ matrix.vault_versions }}
+        image: hashicorp/vault:${{ matrix.vault_version }}
         env:
           VAULT_DEV_ROOT_TOKEN_ID: "testing"
         ports:
@@ -31,8 +52,8 @@ jobs:
           python-version: ${{ matrix.python_versions }}
       - name: "install requirements"
         run: |
-          pip install -r requirements.txt -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
-          pip install -r test-requirements.txt -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
+          pip install -r requirements.txt -c ${{ matrix.openstack_constraints }}
+          pip install -r test-requirements.txt -c ${{ matrix.openstack_constraints }}
       - name: "flake8 run"
         run: |
           flake8