Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(providers): do not install snapd from edge #4733

Merged
merged 2 commits into from
Apr 16, 2024
Merged

fix(providers): do not install snapd from edge #4733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f54a2
fix(providers): do not install snapd from edge
mr-cal Apr 15, 2024
3e8e178
Merge branch 'main' into work/snapd-edge-fix
mr-cal Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions snapcraft/providers.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading