Skip to content

Comments

kola: Extend test to cover recreation of files in /etc#488

Merged
pothos merged 1 commit intoflatcar-masterfrom
kai/overlay-recreation
Nov 30, 2023
Merged

kola: Extend test to cover recreation of files in /etc#488
pothos merged 1 commit intoflatcar-masterfrom
kai/overlay-recreation

Conversation

@pothos
Copy link
Member

@pothos pothos commented Nov 30, 2023

For files like /etc/resolv.conf we want it to be recreated because the tmpfiles rule would do this. For a systemd bug workaround we filtered out some rules but even if we add them back, we still want to ensure that not only the file will always be recreated but that it also is not frozen as upcopy because we prefer the overlay lowerdir as source for updates.
Extend the /etc overlayfs test to ensure recreation of the file and to check against upcopies.

How to use

Will pass for fixed releases.

Testing done

sudo ./kola run -d -k --keys --key ~/.ssh/id_rsa.pub --platform=qemu  --qemu-image /var/tmp/flatcar_production_image.bin.whiteouts cl.overlay.cleanup

passed (and fails for current releases)

  • Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)
  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

For files like /etc/resolv.conf we want it to be recreated because the
tmpfiles rule would do this. For a systemd bug workaround we filtered
out some rules but even if we add them back, we still want to ensure
that not only the file will always be recreated but that it also is not
frozen as upcopy because we prefer the overlay lowerdir as source for
updates.
Extend the /etc overlayfs test to ensure recreation of the file and to
check against upcopies.
@pothos pothos force-pushed the kai/overlay-recreation branch from 96dd72e to f823d20 Compare November 30, 2023 11:15
@pothos pothos merged commit b15d26b into flatcar-master Nov 30, 2023
@pothos pothos deleted the kai/overlay-recreation branch November 30, 2023 13:55
@tormath1
Copy link
Contributor

tormath1 commented Dec 1, 2023

While merging the Mantle PRs, I noticed that it fails on Stable:

not ok - cl.overlay.cleanup
  ---
  Error: "cluster.go:145: \"if test ! -e /etc/resolv.conf ; then echo \\\"Files with tmpfile rule not recreated: $_\\\" ; exit 1; fi && if ! sudo unshare -m bash -c 'umount /etc && test ! -e /etc/resolv.conf'; then echo \\\"File with tmpfile rule exists as upcopy: $_\\\"; exit 1; fi\" failed: output Files with tmpfile rule not recreated: /etc/resolv.conf, status Process exited with status 1"
  ...

EDIT: Checked the instance, it has the r16 of bootengine.

@pothos
Copy link
Member Author

pothos commented Dec 5, 2023

Thanks, fixed in flatcar/bootengine@010fa85

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants