curtin

Merge ~raharper/curtin:fix/vmtest-bcache-missing-environ-vars into curtin:master

  1. Git
  2. lp:~raharper/curtin
  3. fix/vmtest-bcache-missing-environ-vars
  4. Merge into master
Proposed by Ryan Harper
Status: Merged
Approved by: Ryan Harper
Approved revision: 6752bbd85dc757013a3c82c9f24f41276df9b967
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/curtin:fix/vmtest-bcache-missing-environ-vars
Merge into: curtin:master
Diff against target: 17 lines (+4/-3)
1 file modified
examples/tests/bcache-wipe-xfs.yaml (+4/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Watkins (community) Approve
Paride Legovini Approve
Review via email: mp+376911@code.launchpad.net

Commit message

vmtest: Fix a missing unset of OUTPUT_FSTAB

The initramfs-only-one branch modified how we use "dirty-disk" mode
which previously had unset environment variables used by curtin,
OUTPUT_FSTAB; this had some undesirable side-effects and instead
we set OUTPUT_FSTAB to a tmpdir and block-meta will now verify
expected environment variables. We missed a variant of the "dirty-disk"
mode used to recreate a specific bcache bug and now we see stack traces
warning about unset OUTPUT_FSTAB in vmtest output:

  raise KeyError("missing environment vars: %s" % missing)

This branch applies the same fix to this scenario.

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
Dan Watkins (oddbloke) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:6752bbd85dc757013a3c82c9f24f41276df9b967
https://jenkins.ubuntu.com/server/job/curtin-ci/3803/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3803/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3803/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3803/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3803/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/3803//rebuild

review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Commit message lints:
- Line #10 has 12 too many characters. Line starts with: "[40.532361] cloud-init[1480]:"...

review: Needs Fixing
Revision history for this message
Ryan Harper (raharper) wrote :

Fixed length, re-approved

Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/bcache-wipe-xfs.yaml b/examples/tests/bcache-wipe-xfs.yaml
2index 558d442..1a181a8 100644
3--- a/examples/tests/bcache-wipe-xfs.yaml
4+++ b/examples/tests/bcache-wipe-xfs.yaml
5@@ -6,9 +6,10 @@ early_commands:
6 # would be seen as soon as the disk was partitioned and cause problems
7 # for curtin's use of the disk.
8 # This config recreates issue LP: #1718699
9- 00_blockmeta: [env, -u, OUTPUT_FSTAB, TARGET_MOUNT_POINT=/tmp/my.bdir/target,
10- WORKING_DIR=/tmp/my.bdir/work.d, curtin, --showtrace, -v,
11- block-meta, --umount, custom]
12+ 00_blockmeta: [env, OUTPUT_FSTAB=/tmp/my.bdir/state/fstab,
13+ TARGET_MOUNT_POINT=/tmp/my.bdir/target,
14+ WORKING_DIR=/tmp/my.bdir/work.d, curtin, --showtrace, -v,
15+ block-meta, --umount, custom]
16 01_clear_holders: [curtin, clear-holders, --preserve, /dev/disk/by-id/virtio-disk-b]
17 02_quick_erase: [curtin, block-wipe, --mode, superblock, /dev/disk/by-id/virtio-disk-b]
18

Subscribers

People subscribed via source and target branches