Merge ~awe/snappy-hwe-snaps/+git/network-manager:snap-update-20-epoch into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20

[Tony Espy]

Since the uc20 version of the network-manager snap has been updated to default to the native netplan configuration plugin, it's no longer possible to refresh from an earlier track, as the format and location of system-connection files have changed.

If it's decided at some point in the future that cross-track refreshes need to be supported, then logic will need to be added to the post-refresh hook to handle conversion of the connection files, and the epoch adjusted accordingly to reflect this.

Tested on a Dell Edge 3000 with network-manager 1.2.2-28 (615) installed:

$ snap list | grep network
network-manager 1.2.2-28 615 latest/stable canonical* -
admin@C2112XX:~$ sudo snap install network-manager_1.22.10-5-dev_amd64.snap --dangerous
error: cannot install snap file: cannot refresh "network-manager" to local snap with epoch 1,
       because it can't read the current epoch of 0

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:8eaf3e2841404dc06d79900d9f1f757b36235fb4
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/573/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/606/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/606
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/606
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/606
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1392
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1134
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1186/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/573/rebuild

review: Needs Fixing (continuous-integration)

[Heather Ellsworth (hellsworth)]

The system-enablement-ci-bot error is because of the use of epoch 1.

Do we need to use epochs here? I think epochs are just another way of controlling what versions a user auto-updates, but wouldn't it be sufficient to just put the current snap into 20/beta? I thought that was what we decided yesterday.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

I think using epochs is appropriate, we can move to 'epoch: 1*' when/if we have hooks ready to do system connections conversion. In any case the tests need to be fixed.

[Tony Espy (awe)]

@Heather

Per our discussion last week, the epoch prevents someone from refreshing from an earlier version of the snap where the keyfile plugin is being used for system-connections. If they updated to the uc20 version, they'd lose all of their connections.

Also @Alfonso explained, if we decide that this is something we want to support, then we need to implement the conversion logic in the post-install hook, and then set the epoch to "1*".

@Alfonso, I'll fix the test(s).

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:288edd24cbbd85e8344f9b1b4768474584e51c02
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/574/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/607/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/607
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/607
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/607
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1393
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1135
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1187/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/574/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:bd2e479614ec595050aaf4f0f63f6aec12adc095
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/575/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/608
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/608
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/608
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/608
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1394
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1136
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1188/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/575/rebuild

review: Approve (continuous-integration)

[Heather Ellsworth (hellsworth)]

looks good to me!

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8a3e167..0b858fb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,6 +13,16 @@ base: core20
 confinement: strict
 grade: stable
 
+# Since the uc20 network-manager snap currently defaults to the native
+# netplan config plugin, the default format of connection files has
+# switched from keyfile to netplan, thus a fresh from earlier tracks
+# of network-manager will not work w/out post-refresh hook support to
+# handle conversion of system connection files. For this reason, this
+# version of the network-manager snap declares the epoch 1. If/when
+# support is added to convert from keyfile to netplan, then the epoch
+# will be adjusted accordingly.
+epoch: 1
+
 slots:
   service: network-manager
 
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index ce6ca0e..b068085 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+snap_connect_ifaces() {
+    snap connect network-manager:firewall-control :firewall-control
+    snap connect network-manager:network :network    
+    snap connect network-manager:network-setup-observe :network-setup-observe
+    snap connect network-manager:ppp :ppp
+    snap connect network-manager:nmcli network-manager:service    
+}
+
 snap_install() {
 	name=$1
 	if [ -n "$SNAP_CHANNEL" ] ; then
@@ -8,11 +16,8 @@ snap_install() {
 			snap install --$SNAP_CHANNEL $name
 		fi
 	else
-		# Need first install from store to get all necessary assertions into
-		# place. Second local install will then bring in our locally built
-		# snap.
-		snap install $name $2
 		snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
+		snap_connect_ifaces
 	fi
 }