Skip to content

Commit

Permalink
fix(providers): do not install snapd from edge (#4733)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mr-cal authored Apr 16, 2024
1 parent be36b4d commit 6c96bd2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 17 deletions.
5 changes: 0 additions & 5 deletions snapcraft/providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions tests/spread/core22/components/task.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions tests/spread/core24/components/task.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/test_providers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 6c96bd2

Please sign in to comment.