~ondrak/+git/snapd:smart-systemd

Last commit made on 2021-07-14
Get this branch:
git clone -b smart-systemd https://git.launchpad.net/~ondrak/+git/snapd
Only Ondrej Kubik can upload to this branch. If you are Ondrej Kubik please log in for upload directions.

Branch merges

Branch information

Name:
smart-systemd
Repository:
lp:~ondrak/+git/snapd

Recent commits

2c73e68... by Ondrej Kubik

overlord/configstate/configcore/vitality_test: update test for quota and smart systemd tests

Signed-off-by: Ondrej Kubik <email address hidden>

50677a2... by Ondrej Kubik

Merge remote-tracking branch 'snapcore/master' into smart-systemd

92de58e... by Michael Vogt

Merge pull request #10527 from anonymouse64/feature/nested-cloud-init-vuln-test-fix

tests/nested/cloud-init-{never-used,nocloud}-not-vuln: fix tests, use 2.45

c4b8aa8... by Michael Vogt

Merge pull request #10517 from anonymouse64/feature/purge-all-non-disabled-snaps-reset

tests/lib/reset.sh: add workaround from refresh-vs-services tests for all tests

fdd4025... by Ondrej Kubik

overlord/servicestate: update test after merge with fixes for smart systemd

Signed-off-by: Ondrej Kubik <email address hidden>

4d39814... by Samuele Pedroni

o/assertstate: check for conflicts when refreshing and commiting validation set asserts

Merge pull request #10511 from stolowski/validation-sets/check-conflicts-before-commit

Refresh validation sets in enforcing mode and check for conflicts before committing them to asserts db.

3e87bb4... by Ondrej Kubik

Merge remote-tracking branch 'snapcore/master' into smart-systemd

1de7a5f... by Ondrej Kubik

overlord/servicestate: cleanup tests for smart systemd for easier updates

Signed-off-by: Ondrej Kubik <email address hidden>

7fea6f8... by Ian Johnson

tests/nested/manual: fix other cloud-init test checks too

These tests suffered from the same problem as the tests for the cloud-init
vulnerability, so fix them too.

Signed-off-by: Ian Johnson <email address hidden>

6150b91... by Ian Johnson

tests/nested/cloud-init-{never-used,nocloud}-not-vuln: fix tests, use 2.45

Use snapd 2.45 as the baseline snapd version in the image that we build for the
refresh case, since this test variant is about old devices that were built
before the fix was merged.

Additionally, fix the environment variables which were subtly wrong (missing
the _SNAPD_), and also replace the nested_is_core_16_system with the equivalent
os.query call.

Finally, fix the cloud-init journal check to actually fail if we don't see the
message after 60 seconds, and check for the right message (which is lower-case)

Signed-off-by: Ian Johnson <email address hidden>