keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
628a3aa22f
rpm-ostree/tests/compose-tests/test-misc-tweaks.sh

91 lines
3.2 KiB
Bash
Raw Normal View History

compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
#!/bin/bash
set -xeuo pipefail
dn=$(cd $(dirname $0) && pwd)
. ${dn}/libcomposetest.sh
prepare_compose_test "misc-tweaks"
# No docs
pysetjsonmember "documentation" "False"
postprocess: Set default.target in /usr Follow-up improvement after https://github.com/openshift/os/pull/135 This should ensure it survives systemd's preset run on firstboot. Although honestly...what we should *really* do is check whether the `default.target` symlink target exists, and if not reset it to `multi-user.target` so no one would have to care, but that'd be conceptually separate from this, so I may do it later. Closes: #1427 Approved by: jlebon
2018-06-25 23:22:02 +03:00
# Note this overrides:
# $ rpm -q systemd
# systemd-238-8.git0e0aa59.fc28.x86_64
# $ rpm -qlv systemd|grep -F 'system/default.target '
# lrwxrwxrwx 1 root root 16 May 11 06:59 /usr/lib/systemd/system/default.target -> graphical.target
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
pysetjsonmember "default_target" '"multi-user.target"'
Add a treefile option to stop creating /etc/machine-id We actually want systemd's `ConditionFirstBoot` to fire. The primary rationale here is that we're adopting Ignition for Fedora CoreOS, and having `ConditionFirstBoot=` function will help a lot, as the idea is it only runs once. However, I discovered that this breaks the `units` directive for example, as systemd blows away all the unit state in `/etc`. The correct thing to do from the start is to use presets. We could add an implementation of `units` which works with this on and instead writes a preset file but...eh. My plan is to at some point introduce an "epoch" and flip various defaults, this one, `tmp-is-dir`, the passwd file handling, etc. See: https://github.com/dustymabe/bootengine/pull/11 Closes: #1425 Approved by: jlebon
2018-06-22 22:15:04 +03:00
pysetjsonmember "machineid-compat" 'False'
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
pysetjsonmember "units" '["tuned.service"]'
# And test adding/removing files
postprocess: Allow add-files into /etc Even though it's really `/usr/etc`. This is for greater consistency with `postprocess-script` where it appears as `/etc`. Closes: #997 Approved by: jlebon
2017-09-28 04:48:52 +03:00
pysetjsonmember "add-files" '[["foo.txt", "/usr/etc/foo.txt"],
["baz.txt", "/usr/share/baz.txt"],
["bar.txt", "/etc/bar.txt"]]'
compose: Copy in additional files before postprocessing Sometimes it's useful to have access to the additional files when running the post script, so this re-orders the compose process to copy the additional files in before the post script runs Signed-off-by: Jonathan Dieter <jdieter@lesbg.com> Closes: #997 Approved by: jlebon
2017-09-18 18:10:52 +03:00
pysetjsonmember "postprocess-script" \"$PWD/postprocess.sh\"
cat > postprocess.sh << EOF
#!/bin/bash
set -xeuo pipefail
echo misc-tweaks-postprocess-done > /usr/share/misc-tweaks-postprocess-done.txt
cp -a /usr/etc/foo.txt /usr/share/misc-tweaks-foo.txt
EOF
chmod a+x postprocess.sh
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
pysetjsonmember "remove-files" '["etc/hosts"]'
pysetjsonmember "remove-from-packages" '[["setup", "/etc/hosts\..*"]]'
rnd=$RANDOM
echo $rnd > composedata/foo.txt
postprocess: Allow add-files into /etc Even though it's really `/usr/etc`. This is for greater consistency with `postprocess-script` where it appears as `/etc`. Closes: #997 Approved by: jlebon
2017-09-28 04:48:52 +03:00
echo bar > composedata/bar.txt
echo baz > composedata/baz.txt
compose: Add `tmp-is-dir` option to make `/tmp` a directory There are a few reasons to do this. First, systemd changed to refuse mounts on symlinks, and hence if one *wants* "/tmp-on-tmpfs", one would need to write a different `sysroot-tmp.mount` unit. Second, the original rationale for having this symlink was that if you had multiple ostree stateroots ("osnames"), it's nicer if they had the same `/tmp` to avoid duplication. But in practice today that's already an issue due to `/var/tmp`, and further the multiple-stateroot case is pretty unusual. And that case is *further* broken by SELinux (if one wanted to have e.g. an Ubuntu and Fedora) stateroots. So let's fully decouple this and make `/tmp` a plain old directory by default, so systemd's `tmp.mount` can become useful. Now, things get interesting for the case where someone wants a physical `/tmp` that *does* persist across reboots. Right now, if one just did a `systemctl mask tmp.mount` as we do in Fedora Atomic Host's cloud images, you'd get a semantic where `/tmp` stays per-deployment, which is weird. Our recommendation for that should likely be to set up a bind mount for `/tmp` → `/var/tmp`. For now, this stays an option to ensure compatibility; if FAH Cloud images want to stay with "physical /tmp", then we'd have to change the kickstart. Closes: https://github.com/projectatomic/rpm-ostree/issues/669 Closes: #778 Approved by: jlebon
2017-05-17 21:48:48 +03:00
# Test tmp-is-dir
pysetjsonmember "tmp-is-dir" 'True'
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
# Do the compose
runcompose
echo "ok compose"
# Tests for nodocs
ostree --repo=${repobuild} ls -R ${treeref} /usr/share/man > manpages.txt
assert_not_file_has_content manpages.txt man5/ostree.repo.5
echo "ok no manpages"
# Tests for units
ostree --repo=${repobuild} ls ${treeref} \
postprocess: Set default.target in /usr Follow-up improvement after https://github.com/openshift/os/pull/135 This should ensure it survives systemd's preset run on firstboot. Although honestly...what we should *really* do is check whether the `default.target` symlink target exists, and if not reset it to `multi-user.target` so no one would have to care, but that'd be conceptually separate from this, so I may do it later. Closes: #1427 Approved by: jlebon
2018-06-25 23:22:02 +03:00
/usr/lib/systemd/system/default.target > out.txt
assert_file_has_content out.txt '-> .*multi-user\.target'
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
echo "ok default target"
ostree --repo=${repobuild} ls ${treeref} \
/usr/etc/systemd/system/multi-user.target.wants > out.txt
assert_file_has_content out.txt '-> .*/tuned.service'
echo "ok enable units"
# Tests for files
ostree --repo=${repobuild} cat ${treeref} /usr/etc/foo.txt > out.txt
assert_file_has_content out.txt $rnd
postprocess: Allow add-files into /etc Even though it's really `/usr/etc`. This is for greater consistency with `postprocess-script` where it appears as `/etc`. Closes: #997 Approved by: jlebon
2017-09-28 04:48:52 +03:00
ostree --repo=${repobuild} cat ${treeref} /usr/etc/bar.txt > out.txt
assert_file_has_content out.txt bar
ostree --repo=${repobuild} cat ${treeref} /usr/share/baz.txt > out.txt
assert_file_has_content out.txt baz
compose: Copy in additional files before postprocessing Sometimes it's useful to have access to the additional files when running the post script, so this re-orders the compose process to copy the additional files in before the post script runs Signed-off-by: Jonathan Dieter <jdieter@lesbg.com> Closes: #997 Approved by: jlebon
2017-09-18 18:10:52 +03:00
# https://github.com/projectatomic/rpm-ostree/pull/997
ostree --repo=${repobuild} cat ${treeref} /usr/share/misc-tweaks-foo.txt > out.txt
assert_file_has_content out.txt $rnd
compose-tests: Consolidate some misc options into `test-misc-tweaks.sh` I was about to add another one of these but it feels like a bit overkill to run through a recompose for trivial tweaks like turning off docs. We can do a compose with multiple options at once and test the result as a unit, at least for the smaller/less invasive options. This change is prep for adding a switch to do `/tmp` as a regular dir. Closes: #777 Approved by: jlebon
2017-05-17 21:52:24 +03:00
echo "ok add-files"
ostree --repo=${repobuild} ls ${treeref} /usr/etc > out.txt
assert_not_file_has_content out.txt '/usr/etc/hosts$'
echo "ok remove-files"
ostree --repo=${repobuild} ls ${treeref} /usr/etc > out.txt
assert_not_file_has_content out.txt '/usr/etc/hosts\.allow$'
assert_not_file_has_content out.txt '/usr/etc/hosts\.deny$'
echo "ok remove-from-packages"
compose: Add `tmp-is-dir` option to make `/tmp` a directory There are a few reasons to do this. First, systemd changed to refuse mounts on symlinks, and hence if one *wants* "/tmp-on-tmpfs", one would need to write a different `sysroot-tmp.mount` unit. Second, the original rationale for having this symlink was that if you had multiple ostree stateroots ("osnames"), it's nicer if they had the same `/tmp` to avoid duplication. But in practice today that's already an issue due to `/var/tmp`, and further the multiple-stateroot case is pretty unusual. And that case is *further* broken by SELinux (if one wanted to have e.g. an Ubuntu and Fedora) stateroots. So let's fully decouple this and make `/tmp` a plain old directory by default, so systemd's `tmp.mount` can become useful. Now, things get interesting for the case where someone wants a physical `/tmp` that *does* persist across reboots. Right now, if one just did a `systemctl mask tmp.mount` as we do in Fedora Atomic Host's cloud images, you'd get a semantic where `/tmp` stays per-deployment, which is weird. Our recommendation for that should likely be to set up a bind mount for `/tmp` → `/var/tmp`. For now, this stays an option to ensure compatibility; if FAH Cloud images want to stay with "physical /tmp", then we'd have to change the kickstart. Closes: https://github.com/projectatomic/rpm-ostree/issues/669 Closes: #778 Approved by: jlebon
2017-05-17 21:48:48 +03:00
# https://github.com/projectatomic/rpm-ostree/issues/669
ostree --repo=${repobuild} ls ${treeref} /tmp > ls.txt
assert_file_has_content ls.txt 'd01777 0 0 0 /tmp'
echo "ok /tmp"
Add a treefile option to stop creating /etc/machine-id We actually want systemd's `ConditionFirstBoot` to fire. The primary rationale here is that we're adopting Ignition for Fedora CoreOS, and having `ConditionFirstBoot=` function will help a lot, as the idea is it only runs once. However, I discovered that this breaks the `units` directive for example, as systemd blows away all the unit state in `/etc`. The correct thing to do from the start is to use presets. We could add an implementation of `units` which works with this on and instead writes a preset file but...eh. My plan is to at some point introduce an "epoch" and flip various defaults, this one, `tmp-is-dir`, the passwd file handling, etc. See: https://github.com/dustymabe/bootengine/pull/11 Closes: #1425 Approved by: jlebon
2018-06-22 22:15:04 +03:00
# https://github.com/projectatomic/rpm-ostree/pull/1425
ostree --repo=${repobuild} ls ${treeref} /usr/etc > ls.txt
assert_not_file_has_content ls.txt 'machine-id'
echo "ok machine-id"
Reference in New Issue Copy Permalink