~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:revert-manual-conn

Branch merges

Propose for merging

Merged into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20 at revision c5a47815f0e12210c46f592acec49e1e6266f7aa

Tony Espy: Approve on 2021-03-12

System Enablement Bot: Approve (continuous-integration) on 2021-03-12

Diff: 30 lines (+4/-9)

1 file modified

tests/lib/utilities.sh (+4/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

c759d6a... by Alfonso Sanchez-Beato on 2021-03-12

Revert "spread: fix tests to work with epochs"

This reverts commit bd2e479614ec595050aaf4f0f63f6aec12adc095.
The change was needed so tests could run after changing the
epoch. However, this caused races as connections happen after the snap
is installed, and NM starts without all the permissions it
needs. Revert this back as now we have an epoch 1 snap already
published in 20/beta and we can install it without errors.

01560ae... by System Enablement CI Bot <email address hidden> on 2021-03-11

Open development for 1.22.10-6-dev

5ec3ee8... by System Enablement CI Bot <email address hidden> on 2021-03-11

Bump version to 1.22.10-5

eb9096b... by System Enablement CI Bot <email address hidden> on 2021-03-11

Update manifests to 1.22.10-5

7d8ea4f... by System Enablement CI Bot <email address hidden> on 2021-03-11

Update ChangeLog for 1.22.10-5

eaa6f8f... by System Enablement CI Bot <email address hidden> on 2021-03-10

Merge remote tracking branch snap-update-20-epoch

Merge-Proposal: https://code.launchpad.net/~awe/snappy-hwe-snaps/+git/network-manager/+merge/399241

Author: Tony Espy <(unknown e-mail)>

None

bd2e479... by Tony Espy on 2021-03-08

spread: fix tests to work with epochs

The spread tests used a little known trick of installing
a version of the network-manager snap from the store before
side-loading the snap under test, in order to ensure all of
the interface connections were connected prior to testing.
This no longer works with the epoch introducted for the uc20
version of network-manager due to the switch to netplan based
system connection files.

Signed-off-by: Tony Espy <email address hidden>

8eaf3e2... by Tony Espy on 2021-03-05

fix(snap): bump epoch to 1

This commit bumps the snap epoch to 1 in order
to prevent refreshes from earlier tracks with
incompatible system connection files. For more
details, please refer to snapcraft.yaml.

Signed-off-by: Tony Espy <email address hidden>

5108347... by System Enablement CI Bot <email address hidden> on 2021-02-25

Open development for 1.22.10-5-dev

81fcd62... by System Enablement CI Bot <email address hidden> on 2021-02-25

Bump version to 1.22.10-4