From 59026ab9177eef2a8659ef0a88b30e2592f6c9d7 Mon Sep 17 00:00:00 2001
From: Thomas Perl <thomas.perl@canonical.com>
Date: Mon, 26 Feb 2024 09:29:13 +0100
Subject: [PATCH 1/4] tests(lxd): test newer releases

---
 tests/lxd/spread.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/lxd/spread.yaml b/tests/lxd/spread.yaml
index cb46b05d..37ddb2e5 100644
--- a/tests/lxd/spread.yaml
+++ b/tests/lxd/spread.yaml
@@ -4,6 +4,9 @@ backends:
     lxd:
         systems:
             - ubuntu-16.04
+            - ubuntu-18.04
+            - ubuntu-20.04
+            - ubuntu-22.04
 
 path: /home/test
 

From 28c9e8ade97e17b2df2aa355894288c87c138c5e Mon Sep 17 00:00:00 2001
From: Thomas Perl <thomas.perl@canonical.com>
Date: Thu, 28 Mar 2024 09:09:26 +0100
Subject: [PATCH 2/4] Revert "tests(lxd): test newer releases"

This reverts commit 59026ab9177eef2a8659ef0a88b30e2592f6c9d7.
---
 tests/lxd/spread.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/lxd/spread.yaml b/tests/lxd/spread.yaml
index 37ddb2e5..cb46b05d 100644
--- a/tests/lxd/spread.yaml
+++ b/tests/lxd/spread.yaml
@@ -4,9 +4,6 @@ backends:
     lxd:
         systems:
             - ubuntu-16.04
-            - ubuntu-18.04
-            - ubuntu-20.04
-            - ubuntu-22.04
 
 path: /home/test
 

From 88f669d2d33886af680ace89fe64fcc5354ebe36 Mon Sep 17 00:00:00 2001
From: Maciej Borzecki <maciej.borzecki@canonical.com>
Date: Wed, 13 Mar 2024 15:49:35 +0100
Subject: [PATCH 3/4] tests/lxd: add Ubuntu 18.04, 20.04, 22.04

Extend the list of systems.

Signed-off-by: Maciej Borzecki <maciej.borzecki@canonical.com>
---
 tests/lxd/checks/main/task.yaml | 2 +-
 tests/lxd/spread.yaml           | 3 +++
 tests/lxd/task.yaml             | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/lxd/checks/main/task.yaml b/tests/lxd/checks/main/task.yaml
index b7b3e88c..bd98c6ea 100644
--- a/tests/lxd/checks/main/task.yaml
+++ b/tests/lxd/checks/main/task.yaml
@@ -1,4 +1,4 @@
 summary: Ensure it works.
 
 execute: |
-    echo WORKS
+    echo WORKS $SPREAD_SYSTEM
diff --git a/tests/lxd/spread.yaml b/tests/lxd/spread.yaml
index cb46b05d..37ddb2e5 100644
--- a/tests/lxd/spread.yaml
+++ b/tests/lxd/spread.yaml
@@ -4,6 +4,9 @@ backends:
     lxd:
         systems:
             - ubuntu-16.04
+            - ubuntu-18.04
+            - ubuntu-20.04
+            - ubuntu-22.04
 
 path: /home/test
 
diff --git a/tests/lxd/task.yaml b/tests/lxd/task.yaml
index 0635c5af..9e550499 100644
--- a/tests/lxd/task.yaml
+++ b/tests/lxd/task.yaml
@@ -9,8 +9,10 @@ prepare: |
 execute: |
     spread -vv -reuse -resend &> task.out
 
-    grep 'lxd:ubuntu-16.04:checks/main' task.out
-    grep '^WORKS$' task.out
+    for system in ubuntu-16.04 ubuntu-18.04 ubuntu-20.04 ubuntu-22.04; do
+        grep "lxd:${system}:checks/main" task.out
+        grep "^WORKS ${system}\$" task.out
+    done
 
 debug: |
     cat task.out || true

From 0b91d659e7287574960f253f8ae4d763240edc9f Mon Sep 17 00:00:00 2001
From: thp-canonical <thomas.perl@canonical.com>
Date: Fri, 29 Mar 2024 06:45:23 +0100
Subject: [PATCH 4/4] Update tests/lxd/task.yaml

Co-authored-by: Zeyad Yasser <zeyady98@gmail.com>
---
 tests/lxd/task.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/lxd/task.yaml b/tests/lxd/task.yaml
index 9e550499..9d232101 100644
--- a/tests/lxd/task.yaml
+++ b/tests/lxd/task.yaml
@@ -10,8 +10,8 @@ execute: |
     spread -vv -reuse -resend &> task.out
 
     for system in ubuntu-16.04 ubuntu-18.04 ubuntu-20.04 ubuntu-22.04; do
-        grep "lxd:${system}:checks/main" task.out
-        grep "^WORKS ${system}\$" task.out
+        MATCH "lxd:${system}:checks/main" < task.out
+        MATCH "^WORKS ${system}\$" < task.out
     done
 
 debug: |