Remove manual additions of ubuntu-minimal remotes now that 4.0.10 i…

…s in `4.0/stable`. (#254)
canonical · Aug 5, 2024 · 4e069f5 · 4e069f5
2 parents dd529c0 + 68921ba
commit 4e069f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/bin/helpers b/bin/helpers
@@ -150,6 +150,7 @@ install_lxd() (
     else
         snap remove lxd || true
     fi
+
     snap install lxd --channel="${LXD_SNAP_CHANNEL}"
     snap list lxd
     uname -a
@@ -166,12 +167,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.

diff --git 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"