tests: fix for preseeding failures #8528
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@stolowski this hangs in the preseed tests, oh well :-( |
LXD snap pulls in core18, not core, so the test details had to change. In addition, the test will no longer hang on failure. Restore now correctly sources the helper script to perform the unmount. Unmounting is no longer performed in the execute block. Signed-off-by: Zygmunt Krynicki <me@zygoon.pl>
zyga
force-pushed
the
fix/master-preseed-test
branch
from
07f127b
to
0a9a25f
Compare
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
changed the title
jhenstridge
reviewed
Apr 21, 2020
zyga
force-pushed
the
fix/master-preseed-test
branch
from
428c5b4
to
6991504
Compare
This prevents interaction with spread's ssh session. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
force-pushed
the
fix/master-preseed-test
branch
from
6991504
to
b98b07e
Compare
mvo5
reviewed
Apr 22, 2020
tests/main/preseed/task.yaml
Outdated
| MATCH "Do .+ start-snap-services +Start snap \"core18\" \([0-9]+\) services" < tasks.log | ||
| MATCH "Do .+ run-hook +Run health check of \"core18\" snap" < tasks.log | ||
| MATCH "Do .+ run-hook +Run install hook of \"lxd\" snap if present" < tasks.log | ||
| else |
There was a problem hiding this comment.
nitpick: I wonder if we should be explicit here that this applies to 19.10 and have an else that just fails if we run it on something unexpected?
… the main preseed test (with 20.04) with no need for injecting these snaps.
stolowski
changed the title
stolowski
approved these changes
Apr 28, 2020
anonymouse64
approved these changes
Apr 28, 2020
| @@ -4,7 +4,7 @@ description: | | |||
| can be undone with --reset flag. | |||
|
|
|||
| # TODO: reenable for ubuntu-20.04-*, that now uses the snapd snap | |||
There was a problem hiding this comment.
this TODO can be deleted, no?
| qemu-nbd -c /dev/nbd0 "$CLOUD_IMAGE" | ||
| # Run qemu-ndb as a service, so that it does not interact with ssh | ||
| # stdin/stdout it would otherwise inherit from the spread session. | ||
| systemd-run --system --service-type=forking --unit=qemu-ndb-preseed.service "$(command -v qemu-nbd)" --fork -c /dev/nbd0 "$CLOUD_IMAGE" |
zyga
commented
Apr 28, 2020
| @@ -4,7 +4,7 @@ description: | | |||
| can be undone with --reset flag. | |||
|
|
|||
| # TODO: reenable for ubuntu-20.04-*, that now uses the snapd snap | |||
There was a problem hiding this comment.
Let's remove this in the next pass.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes the various preseed tests in two ways:
preseed.shscript