~mvo/snapd/+git/snapd-mvo:release-2.37.pre1

Last commit made on 2019-01-10
Get this branch:
git clone -b release-2.37.pre1 https://git.launchpad.net/~mvo/snapd/+git/snapd-mvo

Branch merges

Branch information

Name:
release-2.37.pre1
Repository:
lp:~mvo/snapd/+git/snapd-mvo

Recent commits

80e0801... by Michael Vogt

Merge remote-tracking branch 'upstream/master' into release-2.37.pre1

bc7ef2a... by Michael Vogt

debian: add 2.37~pre1 placeholder changelog

153bc84... by Michael Vogt

Merge remote-tracking branch 'upstream/master' into release-2.37.pre1

e034be6... by Michael Vogt

release 2.37~pre1

a35595d... by Maciej Borzecki

overlord/configstate/configcore: support - and _ in cloud init field names

* overlord/configstate/configcore: support - and _ in cloud init fields

cloud-init supports both underscores and hyphens as separators in field names.
Clients can use either, see the examples provided here:
https://cloudinit.readthedocs.io/en/latest/topics/instancedata.html

Make sure that snapd supports both both name formats too.

Signed-off-by: Maciej Borzecki <email address hidden>

* overlord/configstate/configcore: tweak the logic of cloud-init integration

Drop consistency checks. When clound_name is set, prefer other names with
underscore.

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: add spread test for cloud-init integration

The test makes sense when run on a backend that actually uses cloud-init and
sets instance data properly, eg. GCE.

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: tweak the test

Tweak the test to handle older versions of cloud-init (without the query command
support).

Make sure the test runs on all Ubuntu images where cloud-init instance data is
populated (that excludes 14.04).

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: ensure jq is avaialble

Signed-off-by: Maciej Borzecki <email address hidden>

4de7937... by Maciej Borzecki

overlord/configstate/configcore: support - and _ in cloud init field names

* overlord/configstate/configcore: support - and _ in cloud init fields

cloud-init supports both underscores and hyphens as separators in field names.
Clients can use either, see the examples provided here:
https://cloudinit.readthedocs.io/en/latest/topics/instancedata.html

Make sure that snapd supports both both name formats too.

Signed-off-by: Maciej Borzecki <email address hidden>

* overlord/configstate/configcore: tweak the logic of cloud-init integration

Drop consistency checks. When clound_name is set, prefer other names with
underscore.

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: add spread test for cloud-init integration

The test makes sense when run on a backend that actually uses cloud-init and
sets instance data properly, eg. GCE.

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: tweak the test

Tweak the test to handle older versions of cloud-init (without the query command
support).

Make sure the test runs on all Ubuntu images where cloud-init instance data is
populated (that excludes 14.04).

Signed-off-by: Maciej Borzecki <email address hidden>

* tests/main/cloud-init: ensure jq is avaialble

Signed-off-by: Maciej Borzecki <email address hidden>

c9b12b7... by timchen119 <email address hidden>

use major() and minor() in <sys/sysmacros.h> instead of MAJOR and MINOR

* use major() and minor() in sys/sysmacros.h instead of MAJOR and MINOR macro in linux/kdev_t.h

* cmd/snap-confine: use makedev instead of MKDEV

We recently found (Thanks to Tim Chen) that MAJOR/MINOR/MKDEV macros are
not so great and have issues with larger numbers. Instead we should use
major(), minor() and makedev(). This patch completes the transition
across the tree.

47bf740... by Michael Vogt

tests: review/fix the autopkgtest failures in disco

* tests: skip proxy test if https{,s}_proxy is set

The tinyproxy in the proxy test uses socket.socket(AF_INET) to connect
o the target for https and on systems that do not allow direct
connections to the outside world 443 port this will fail.

* tests: skip network-retry if http{,s}_proxy is set

The network-retry test may fail when http_proxy is set because
 it breaks DNS for the test. However if the proxy is available
and defined via an IP instead of a DNS name the test will not
work because the DNS is bypassed.

* tests: skip snap-service-watchdog in autopkgtest

Skip autopkgtest as this test is timing dependent and ADT is often
very slow.

Also fixes a incorrect print in the watchdog service binary:

   lib/snaps/test-snapd-service-watchdog/bin/direct

which lead to misleading:
```
Jan 09 20:28:55 autopkgtest test-snapd-service-watchdog.direct-watchdog-ok[21555]: INFO:root:watchdog notification every 0s
output
```

* address review feedback (thanks to John)

* test: review feedback for network-retry (thanks to mborzecki)

* tests: do not run some tests in autopkgtest

We get timeouts in autopkgtest on amd64 currently so this disables
some of the slower running tests in this environment. The real
issue is that the cloud that runs the autopkgtest is slow dues to
overcommitment it seems. But this is a reasonable workaround for
now.

* tests: re-enable install-store in ADT, disable snapctl-services/nfs-support

8e3cf0e... by timchen119 <email address hidden>

use major() and minor() in <sys/sysmacros.h> instead of MAJOR and MINOR

* use major() and minor() in sys/sysmacros.h instead of MAJOR and MINOR macro in linux/kdev_t.h

* cmd/snap-confine: use makedev instead of MKDEV

We recently found (Thanks to Tim Chen) that MAJOR/MINOR/MKDEV macros are
not so great and have issues with larger numbers. Instead we should use
major(), minor() and makedev(). This patch completes the transition
across the tree.

0d7619e... by Michael Vogt

tests: review/fix the autopkgtest failures in disco

* tests: skip proxy test if https{,s}_proxy is set

The tinyproxy in the proxy test uses socket.socket(AF_INET) to connect
o the target for https and on systems that do not allow direct
connections to the outside world 443 port this will fail.

* tests: skip network-retry if http{,s}_proxy is set

The network-retry test may fail when http_proxy is set because
 it breaks DNS for the test. However if the proxy is available
and defined via an IP instead of a DNS name the test will not
work because the DNS is bypassed.

* tests: skip snap-service-watchdog in autopkgtest

Skip autopkgtest as this test is timing dependent and ADT is often
very slow.

Also fixes a incorrect print in the watchdog service binary:

   lib/snaps/test-snapd-service-watchdog/bin/direct

which lead to misleading:
```
Jan 09 20:28:55 autopkgtest test-snapd-service-watchdog.direct-watchdog-ok[21555]: INFO:root:watchdog notification every 0s
output
```

* address review feedback (thanks to John)

* test: review feedback for network-retry (thanks to mborzecki)

* tests: do not run some tests in autopkgtest

We get timeouts in autopkgtest on amd64 currently so this disables
some of the slower running tests in this environment. The real
issue is that the cloud that runs the autopkgtest is slow dues to
overcommitment it seems. But this is a reasonable workaround for
now.

* tests: re-enable install-store in ADT, disable snapctl-services/nfs-support