From 6c96bd2b6788f703811b1f653fb94edafcb96f0e Mon Sep 17 00:00:00 2001
From: Callahan <callahan.kovacs@canonical.com>
Date: Tue, 16 Apr 2024 07:59:03 -0500
Subject: [PATCH] fix(providers): do not install snapd from edge (#4733)

snapd was installed from the edge channel to support components. This
has been replaced with the `_retry_with_newer_snapd` decorator.

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
---
 snapcraft/providers.py                   | 5 -----
 tests/spread/core22/components/task.yaml | 4 ----
 tests/spread/core24/components/task.yaml | 4 ----
 tests/unit/test_providers.py             | 4 ----
 4 files changed, 17 deletions(-)

diff --git a/snapcraft/providers.py b/snapcraft/providers.py
index 19c7c7f196..a999537a87 100644
--- a/snapcraft/providers.py
+++ b/snapcraft/providers.py
@@ -201,11 +201,6 @@ def get_base_configuration(
         environment=environment,
         hostname=instance_name,
         snaps=[
-            Snap(
-                name="snapd",
-                channel="latest/edge",
-                classic=True,
-            ),
             Snap(
                 name=snap_name,
                 channel=snap_channel,
diff --git a/tests/spread/core22/components/task.yaml b/tests/spread/core22/components/task.yaml
index 4bacd22dcd..c4b613034c 100644
--- a/tests/spread/core22/components/task.yaml
+++ b/tests/spread/core22/components/task.yaml
@@ -1,12 +1,8 @@
 summary: Build a snap with components
 
-prepare: |
-  snap refresh snapd --edge
-
 restore: |
   snapcraft clean
   rm -f ./*.snap ./*.comp
-  snap refresh snapd --stable
 
 execute: |
   snapcraft pack
diff --git a/tests/spread/core24/components/task.yaml b/tests/spread/core24/components/task.yaml
index a0c6ad86db..bac51f617d 100644
--- a/tests/spread/core24/components/task.yaml
+++ b/tests/spread/core24/components/task.yaml
@@ -1,12 +1,8 @@
 summary: Build a snap with components
 
-prepare: |
-  snap refresh snapd --edge
-
 restore: |
   snapcraft clean
   rm -f ./*.snap ./*.comp
-  snap refresh snapd --stable
 
 execute: |
   snapcraft pack
diff --git a/tests/unit/test_providers.py b/tests/unit/test_providers.py
index a732a86cda..5619100021 100644
--- a/tests/unit/test_providers.py
+++ b/tests/unit/test_providers.py
@@ -214,7 +214,6 @@ def test_get_base_configuration(
         environment="test-env",
         hostname="test-instance-name",
         snaps=[
-            Snap(name="snapd", channel="latest/edge", classic=True),
             Snap(name="test-snap-name", channel="test-channel", classic=True),
         ],
         packages=["gnupg", "dirmngr", "git"],
@@ -260,7 +259,6 @@ def test_get_base_configuration_snap_channel(
         environment=ANY,
         hostname=ANY,
         snaps=[
-            Snap(name="snapd", channel="latest/edge", classic=True),
             Snap(name="snapcraft", channel=snap_channel, classic=True),
         ],
         packages=ANY,
@@ -297,7 +295,6 @@ def test_get_base_configuration_snap_instance_name_default(
         environment=ANY,
         hostname=ANY,
         snaps=[
-            Snap(name="snapd", channel="latest/edge", classic=True),
             Snap(name="snapcraft", channel=None, classic=True),
         ],
         packages=ANY,
@@ -334,7 +331,6 @@ def test_get_base_configuration_snap_instance_name_not_running_as_snap(
         environment=ANY,
         hostname=ANY,
         snaps=[
-            Snap(name="snapd", channel="latest/edge", classic=True),
             Snap(name="snapcraft", channel=None, classic=True),
         ],
         packages=ANY,