From 6016b91799e1733b42daef5ed1bb2a1bd29dc7d6 Mon Sep 17 00:00:00 2001
From: Christopher Petito <47751006+krissetto@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:56:43 +0100
Subject: [PATCH] Run integration tests against multiple moby engines/api
 versions

Signed-off-by: Christopher Petito <47751006+krissetto@users.noreply.github.com>
---
 .github/workflows/ci.yml | 19 ++++++++++++++++++-
 Makefile                 |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 628c53504..50bfa6346 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,11 +46,28 @@ jobs:
         strategy:
             matrix:
                 variant: [ "integration-dind", "integration-dind-ssl", "integration-dind-ssh" ]
+                api-version: [1.44, 1.43, 1.42, 1.24] # 1.24 is the oldest supported version
+                engine: 25.0 # latest
+                include:
+                    # ugly repetition because GHA doesn't support lists in these objects
+                    # so we need a separate entry for each variant
+                    - engine: 23.0 # mirantis lts
+                      api-version: 1.42
+                      variant: "integration-dind"
+                    - engine: 23.0 # mirantis lts
+                      api-version: 1.42
+                      variant: "integration-dind-ssl"
+                    - engine: 23.0 # mirantis lts
+                      api-version: 1.42
+                      variant: "integration-dind-ssh"
 
         steps:
             - uses: actions/checkout@v4
-            - name: make ${{ matrix.variant }}
+            - name: ${{ matrix.variant }} - v${{ matrix.engine.version }}/v${{ matrix.engine.api }}
               run: |
                   docker logout
                   rm -rf ~/.docker
                   make ${{ matrix.variant }}
+              env:
+                TEST_ENGINE_VERSION: ${{ matrix.engine.version }}
+                TEST_API_VERSION: ${{ matrix.engine.api }}
diff --git a/Makefile b/Makefile
index 00ebca05c..25a83205b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-TEST_API_VERSION ?= 1.43
-TEST_ENGINE_VERSION ?= 24.0
+TEST_API_VERSION ?= 1.44
+TEST_ENGINE_VERSION ?= 25.0
 
 ifeq ($(OS),Windows_NT)
     PLATFORM := Windows