From baa954374d934fe253c12f5e2fa5235860c569a6 Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Mon, 5 Aug 2024 11:56:40 -0400
Subject: [PATCH 1/2] Revert "bin/helpers: add ubuntu-minimal remotes if
 needed"

This reverts commit 355849bec8b1c75b5151c0b1df67d98f7a6cb2ac.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 bin/helpers | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bin/helpers b/bin/helpers
index dffe20cea..60eecb7b5 100644
--- a/bin/helpers
+++ b/bin/helpers
@@ -148,6 +148,7 @@ install_lxd() (
     else
         snap remove lxd || true
     fi
+
     snap install lxd --channel="${LXD_SNAP_CHANNEL}"
     snap list lxd
     uname -a
@@ -164,12 +165,6 @@ install_lxd() (
         cp "${LXD_SIDELOAD_PATH}" /var/snap/lxd/common/lxd.debug
         systemctl start snap.lxd.daemon
     fi
-
-    # TODO remove once 4.0.10 is in 4.0/stable
-    if [ "$(lxc remote list -f csv | grep -cwF "minimal")" -lt 2 ]; then
-        lxc remote add ubuntu-minimal https://cloud-images.ubuntu.com/minimal/releases/ --protocol simplestreams || true
-        lxc remote add ubuntu-minimal-daily https://cloud-images.ubuntu.com/minimal/daily/ --protocol simplestreams || true
-    fi
 )
 
 # hasNeededAPIExtension: check if LXD supports the needed extension.

From 68921baf26aaeade15318cc3065eda58bbac0ce4 Mon Sep 17 00:00:00 2001
From: Simon Deziel <simon.deziel@canonical.com>
Date: Mon, 5 Aug 2024 11:57:12 -0400
Subject: [PATCH 2/2] Revert "tests/cluster: add minimal remotes for
 4.0/stable"

This reverts commit dde56db26f6b75f5b7f1c411b3f6e2575a97b899.

Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 tests/cluster | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/cluster b/tests/cluster
index 7cffc10ab..d07fa5b28 100755
--- a/tests/cluster
+++ b/tests/cluster
@@ -78,12 +78,6 @@ cluster:
   cluster_token: "${TOKEN}"
 EOF
     fi
-
-    # add minimal remotes if needed (TODO: remove once 4.0.10 is in 4.0/stable)
-    if [ "$(lxc exec "${PREFIX}-$i" -- lxc remote list -f csv | grep -cwF "minimal")" -lt 2 ]; then
-        lxc exec "${PREFIX}-$i" -- lxc remote add ubuntu-minimal https://cloud-images.ubuntu.com/minimal/releases/ --protocol simplestreams || true
-        lxc exec "${PREFIX}-$i" -- lxc remote add ubuntu-minimal-daily https://cloud-images.ubuntu.com/minimal/daily/ --protocol simplestreams || true
-    fi
 done
 
 echo "==> Validating the cluster"