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

207 lines
7.3 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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
dn=$(cd "$(dirname "$0")" && pwd)
# shellcheck source=libcomposetest.sh
. "${dn}/libcomposetest.sh"
# Add a local rpm-md repo so we can mutate local test packages
treefile_append "repos" '["test-repo"]'
# test `recommends: true` (test-basic[-unified] test the false path)
build_rpm foobar recommends foobar-rec
build_rpm foobar-rec
treefile: Allow greater/less than versions for pkgs Add a helper function for whitespace_split_packages() so that it now splits a String by whitespace only if it is not wrapped between single quotes. This should allow RHCOS to use syntax like podman > 1.4 in the treefile. Also add new unit tests and tweak existing compose tests to test this functionality.
2020-06-26 20:55:11 +03:00
build_rpm quuz
build_rpm corge version 1.0
build_rpm corge version 2.0
treefile: change `remove-from-packages` implementation Fix https://github.com/coreos/rpm-ostree/issues/2068: `remove-from-packages` deleting files that it shouldn't. Filter out files that user wants removed at `checkout_package_into_root()`, instead of at the `handle_remove_files_from_package()` function that does not check whether files are used by other rpms before removing them.
2020-07-28 18:34:47 +03:00
# test `remove-from-packages` (files shared with other pkgs should not be removed)
build_rpm barbar \
files "/etc/sharedfile
/usr/bin/barbarextra" \
install "mkdir -p %{buildroot}/etc && echo shared file data > %{buildroot}/etc/sharedfile
mkdir -p %{buildroot}/usr/bin && echo more binary data > %{buildroot}/usr/bin/barbarextra"
build_rpm barbaz \
files "/etc/sharedfile" \
install "mkdir -p %{buildroot}/etc && echo shared file data > %{buildroot}/etc/sharedfile"
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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
echo gpgcheck=0 >> yumrepo.repo
ln "$PWD/yumrepo.repo" config/yumrepo.repo
# the top-level manifest doesn't have any packages, so just set it
treefile: change `remove-from-packages` implementation Fix https://github.com/coreos/rpm-ostree/issues/2068: `remove-from-packages` deleting files that it shouldn't. Filter out files that user wants removed at `checkout_package_into_root()`, instead of at the `handle_remove_files_from_package()` function that does not check whether files are used by other rpms before removing them.
2020-07-28 18:34:47 +03:00
treefile_append "packages" $'["\'foobar >= 0.5\' quuz \'corge < 2.0\' barbar barbaz"]'
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
# With docs and recommends, also test multi includes
cat > config/documentation.yaml <<'EOF'
documentation: true
treefile: Support multiple includes I'm working on having Silverblue inherit from Fedora CoreOS. But conceptually it also inherits from (parts of) Workstation. It is just easier if we support multiple inheritance, then I don't need to think too hard about how to make it a single inheritance chain. Closes: #1870 Approved by: jlebon
2019-07-14 21:09:41 +03:00
EOF
treefile: Add readonly-executables Same motivation as https://github.com/ostreedev/ostree/pull/2091/commits/7392259332e00c33ed45b904deabde08f4da3e3c I think we should encourage removing the writable bits from executables. This has happened to me: https://thomask.sdf.org/blog/2019/11/09/take-care-editing-bash-scripts.html And not having the writable bit may help prevent hardlink corruption with OSTree in some cases. We can't do this by default, but add a convenient treefile option for it. This starts out by just doing this for RPMs, but I'll add a secondary pass which does it during postprocessing soon too.
2020-05-06 23:59:39 +03:00
cat > config/other.yaml <<'EOF'
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
recommends: true
treefile: Add readonly-executables Same motivation as https://github.com/ostreedev/ostree/pull/2091/commits/7392259332e00c33ed45b904deabde08f4da3e3c I think we should encourage removing the writable bits from executables. This has happened to me: https://thomask.sdf.org/blog/2019/11/09/take-care-editing-bash-scripts.html And not having the writable bit may help prevent hardlink corruption with OSTree in some cases. We can't do this by default, but add a convenient treefile option for it. This starts out by just doing this for RPMs, but I'll add a secondary pass which does it during postprocessing soon too.
2020-05-06 23:59:39 +03:00
readonly-executables: true
treefile: Support multiple includes I'm working on having Silverblue inherit from Fedora CoreOS. But conceptually it also inherits from (parts of) Workstation. It is just easier if we support multiple inheritance, then I don't need to think too hard about how to make it a single inheritance chain. Closes: #1870 Approved by: jlebon
2019-07-14 21:09:41 +03:00
EOF
treefile: Add readonly-executables Same motivation as https://github.com/ostreedev/ostree/pull/2091/commits/7392259332e00c33ed45b904deabde08f4da3e3c I think we should encourage removing the writable bits from executables. This has happened to me: https://thomask.sdf.org/blog/2019/11/09/take-care-editing-bash-scripts.html And not having the writable bit may help prevent hardlink corruption with OSTree in some cases. We can't do this by default, but add a convenient treefile option for it. This starts out by just doing this for RPMs, but I'll add a secondary pass which does it during postprocessing soon too.
2020-05-06 23:59:39 +03:00
treefile_append "include" '["documentation.yaml", "other.yaml"]'
for x in 'recommends' 'documentation' 'readonly-executables'; do
treefile_del "$x"
done
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
treefile: Add exclude-packages In FCOS we have a kola test that basically does `rpm -q python`. It's...a bit silly to spawn a whole VM for this. Ensuring that some specific packages don't get included has come up in a few cases. I think FCOS/RHCOS at least will want to blacklist `dnf` for example. And as noted above, FCOS could blacklist `python`. One major benefit of doing this inside rpm-ostree is that one gets the full "libsolv error message experience" when dependency resolution fails, e.g. blacklisting `glibc` I get: ``` Problem 79: conflicting requests - package coreos-installer-systemd-0.1.2-1.fc31.x86_64 requires coreos-installer = 0.1.2-1.fc31, but none of the providers can be installed - package coreos-installer-0.1.2-1.fc31.x86_64 requires rtld(GNU_HASH), but none of the providers can be installed - package glibc-2.30-10.fc31.x86_64 is filtered out by exclude filtering - package glibc-2.30-7.fc31.x86_64 is filtered out by exclude filtering - package glibc-2.30-8.fc31.x86_64 is filtered out by exclude filtering - package glibc-2.30-5.fc31.i686 is filtered out by exclude filtering - package glibc-2.30-5.fc31.x86_64 is filtered out by exclude filtering - package glibc-2.30-10.fc31.i686 is filtered out by exclude filtering ```
2020-02-05 06:22:08 +03:00
# Test blacklists
treefile_append "exclude-packages" '["somenonexistent-package", "gnome-shell"]'
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
tests: Make more resistant to releasever changes Now that cosa and FCOS have moved to f32, a bunch of tests are breaking. Let's make them more resistant to releasever changes. While we're here though, bump the container image we use on the target host to f32, and update the systemd example output.
2020-06-02 16:57:05 +03:00
# systemd-245.4-1.fc32.x86_64
# $ rpm -qlv systemd | grep -F 'system/default.target'
# lrwxrwxrwx 1 root root 16 Apr 1 17:46 /usr/lib/systemd/system/default.target -> graphical.target
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
treefile_set "default-target" '"multi-user.target"'
treefile_append "units" '["zincati.service"]'
# Need this in order to test unit enablement
treefile_set "machineid-compat" "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
# And test adding/removing files
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
treefile_append "add-files" '[["foo.txt", "/usr/etc/foo.txt"],
["baz.txt", "/usr/share/baz.txt"],
["bar.txt", "/etc/bar.txt"]]'
treefile_set "postprocess-script" \"$PWD/postprocess.sh\"
treefile_set "postprocess" '["""#!/bin/bash
treefile: Support inline `postprocess` element (for inheritance) I'm trying to have a more opinionated model where custom builds use inheritance, and currently one can only have a single `postprocess-script`. Further, in YAML it's very convenient to use inline vs external data. Closes: #1527 Approved by: jlebon
2018-09-05 17:53:03 +03:00
touch /usr/share/postprocess-testing""",
"""#!/bin/bash
tests: Add a test for inheritance order of `postprocess` Since I got it backwards when rewriting it in Rust. Closes: #1574 Approved by: jlebon
2018-10-03 21:59:58 +03:00
set -xeuo pipefail
touch /usr/share/included-postprocess-test
treefile: Support inline `postprocess` element (for inheritance) I'm trying to have a more opinionated model where custom builds use inheritance, and currently one can only have a single `postprocess-script`. Further, in YAML it's very convenient to use inline vs external data. Closes: #1527 Approved by: jlebon
2018-09-05 17:53:03 +03:00
rm /usr/share/postprocess-testing
touch /usr/share/postprocess-testing-done"""]'
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
cat > postprocess.sh << EOF
#!/bin/bash
set -xeuo pipefail
treefile: Support inline `postprocess` element (for inheritance) I'm trying to have a more opinionated model where custom builds use inheritance, and currently one can only have a single `postprocess-script`. Further, in YAML it's very convenient to use inline vs external data. Closes: #1527 Approved by: jlebon
2018-09-05 17:53:03 +03:00
# Ordering should be after postprocess
rm /usr/share/postprocess-testing-done
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
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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
treefile_set "remove-files" '["etc/hosts"]'
treefile: change `remove-from-packages` implementation Fix https://github.com/coreos/rpm-ostree/issues/2068: `remove-from-packages` deleting files that it shouldn't. Filter out files that user wants removed at `checkout_package_into_root()`, instead of at the `handle_remove_files_from_package()` function that does not check whether files are used by other rpms before removing them.
2020-07-28 18:34:47 +03:00
treefile_set "remove-from-packages" '[["barbar", "/usr/bin/*"],
["barbar", "/etc/sharedfile"]]'
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
rnd=$RANDOM
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
echo $rnd > config/foo.txt
echo bar > config/bar.txt
echo baz > config/baz.txt
# Test tmp-is-dir False
treefile_set "tmp-is-dir" '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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
new_treefile=config/fedora-misc-tweaks-includer.yaml
tests: Add a test for inheritance order of `postprocess` Since I got it backwards when rewriting it in Rust. Closes: #1574 Approved by: jlebon
2018-10-03 21:59:58 +03:00
cat > ${new_treefile} <<EOF
include: $(basename ${treefile})
postprocess:
- |
#!/bin/bash
set -xeuo pipefail
test -f /usr/share/included-postprocess-test
EOF
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
mkdir -p tmp/rootfs
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
for x in $(seq 3); do
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
rm tmp/rootfs/usr -rf
mkdir -p tmp/rootfs/usr/{bin,share}
mkdir tmp/rootfs/usr/share/testsubdir-${x}
echo sometest${x} > tmp/rootfs/usr/bin/sometestbinary-${x}
chmod a+x tmp/rootfs/usr/bin/sometestbinary-${x}
echo sometestdata${x} > tmp/rootfs/usr/share/sometestdata-${x}
echo sometestdata-subdir-${x} > tmp/rootfs/usr/share/testsubdir-${x}/test
ostree --repo="${repo}" commit --consume --no-xattrs --owner-uid=0 --owner-gid=0 -b testlayer-${x} --tree=dir=tmp/rootfs
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
done
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
rm tmp/rootfs/usr -rf
mkdir -p tmp/rootfs/usr/{share/info,bin}
echo sweet new ls binary > tmp/rootfs/usr/bin/ls
ostree --repo="${repo}" commit --consume --no-xattrs --owner-uid=0 --owner-gid=0 -b testoverride-1 --tree=dir=tmp/rootfs
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
cat >> ${new_treefile} <<EOF
ostree-layers:
- testlayer-1
- testlayer-2
- testlayer-3
ostree-override-layers:
- testoverride-1
EOF
tests: Add a test for inheritance order of `postprocess` Since I got it backwards when rewriting it in Rust. Closes: #1574 Approved by: jlebon
2018-10-03 21:59:58 +03:00
export treefile=${new_treefile}
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/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
# Tests for docs
ostree --repo=${repo} ls -R ${treeref} /usr/share/man > manpages.txt
assert_file_has_content manpages.txt man5/ostree.repo.5
echo "ok manpages"
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
# Tests for units
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} 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"
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} ls ${treeref} \
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
/usr/etc/systemd/system/multi-user.target.wants > out.txt
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
assert_file_has_content out.txt '-> .*/zincati.service'
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 enable units"
# Tests for files
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/etc/foo.txt > out.txt
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
assert_file_has_content out.txt $rnd
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/etc/bar.txt > out.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
assert_file_has_content out.txt bar
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/share/baz.txt > out.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
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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/share/misc-tweaks-foo.txt > out.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
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"
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} ls ${treeref} /usr/etc > out.txt
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
assert_not_file_has_content out.txt '/usr/etc/hosts$'
echo "ok remove-files"
treefile: change `remove-from-packages` implementation Fix https://github.com/coreos/rpm-ostree/issues/2068: `remove-from-packages` deleting files that it shouldn't. Filter out files that user wants removed at `checkout_package_into_root()`, instead of at the `handle_remove_files_from_package()` function that does not check whether files are used by other rpms before removing them.
2020-07-28 18:34:47 +03:00
ostree --repo=${repo} ls ${treeref} /usr/bin > out.txt
assert_not_file_has_content out.txt 'bin/barbar'
assert_not_file_has_content out.txt 'bin/barbarextra'
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} ls ${treeref} /usr/etc > out.txt
treefile: change `remove-from-packages` implementation Fix https://github.com/coreos/rpm-ostree/issues/2068: `remove-from-packages` deleting files that it shouldn't. Filter out files that user wants removed at `checkout_package_into_root()`, instead of at the `handle_remove_files_from_package()` function that does not check whether files are used by other rpms before removing them.
2020-07-28 18:34:47 +03:00
assert_file_has_content out.txt 'etc/sharedfile'
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 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
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} ls ${treeref} /tmp > ls.txt
assert_file_has_content ls.txt 'l00777 0 0 0 /tmp -> sysroot/tmp'
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
echo "ok /tmp"
Add `recommends` to treefile (default on) This is for: https://github.com/projectatomic/rpm-ostree/issues/718 But I'm not going to close that issue as this only does the server side, and I think we should support it client side too. Since I wrote that issue, we ended up skipping the `dnf_transaction_depsolve()` API, and hence we don't need to block on a libdnf change. So this was quite simple. Closes: #1513 Approved by: jlebon
2018-08-22 16:02:25 +03:00
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
rpm-ostree db list --repo=${repo} ${treeref} > pkglist.txt
assert_file_has_content_literal pkglist.txt 'foobar'
assert_file_has_content_literal pkglist.txt 'foobar-rec'
Add `recommends` to treefile (default on) This is for: https://github.com/projectatomic/rpm-ostree/issues/718 But I'm not going to close that issue as this only does the server side, and I think we should support it client side too. Since I wrote that issue, we ended up skipping the `dnf_transaction_depsolve()` API, and hence we don't need to block on a libdnf change. So this was quite simple. Closes: #1513 Approved by: jlebon
2018-08-22 16:02:25 +03:00
echo "ok recommends"
compose: Check that add-files are compatible after parsing While serde gives us type checking, it of course doesn't understand semantics beyond that. One example is checking the compatibility of `add-files` entries with the OSTree model. This is something we can do upfront early on to avoid surprises for users. Also tweak the docs to reflect this new check. Related: #1642 Closes: #1643 Approved by: cgwalters
2018-10-26 20:58:46 +03:00
treefile: Allow greater/less than versions for pkgs Add a helper function for whitespace_split_packages() so that it now splits a String by whitespace only if it is not wrapped between single quotes. This should allow RHCOS to use syntax like podman > 1.4 in the treefile. Also add new unit tests and tweak existing compose tests to test this functionality.
2020-06-26 20:55:11 +03:00
assert_file_has_content_literal pkglist.txt 'quuz'
assert_file_has_content_literal pkglist.txt 'corge-1.0'
assert_not_file_has_content_literal pkglist.txt 'corge-2.0'
echo "ok package versions"
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
# Test overlays/overrides
for x in $(seq 3); do
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/bin/sometestbinary-${x} > t
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
assert_file_has_content t "sometest${x}"
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/share/testsubdir-${x}/test > t
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
assert_file_has_content t sometestdata-subdir-${x}
done
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
ostree --repo=${repo} cat ${treeref} /usr/bin/ls > ls.txt
compose: Add ostree-layers and ostree-override-layers The use case for `ostree-layers` is to support injecting non-RPM content in a more flexible way than can be done with `add-files`, and also without dropping all the way to split composes. This starts with support on the `compose tree` side but down the line I'd like to make it more convenient to do *client* side too. For `ostree-override-layers` this is mainly a development thing for tools like coreos-assembler. Rather than building an RPM we just `make install DESTDIR` then commit and add to `ostree-override-layers`. Closes: #1830 Approved by: jlebon
2019-05-07 15:20:56 +03:00
assert_file_has_content ls.txt '^sweet new ls binary$'
echo "ok layers"
treefile: Add readonly-executables Same motivation as https://github.com/ostreedev/ostree/pull/2091/commits/7392259332e00c33ed45b904deabde08f4da3e3c I think we should encourage removing the writable bits from executables. This has happened to me: https://thomask.sdf.org/blog/2019/11/09/take-care-editing-bash-scripts.html And not having the writable bit may help prevent hardlink corruption with OSTree in some cases. We can't do this by default, but add a convenient treefile option for it. This starts out by just doing this for RPMs, but I'll add a secondary pass which does it during postprocessing soon too.
2020-05-06 23:59:39 +03:00
# Test readonly-executables
ostree --repo=${repo} ls ${treeref} /usr/bin/bash > ls.txt
assert_file_has_content ls.txt '^-00555 .*/usr/bin/bash$'
echo "ok readonly-executables"
compose: Check that add-files are compatible after parsing While serde gives us type checking, it of course doesn't understand semantics beyond that. One example is checking the compatibility of `add-files` entries with the OSTree model. This is something we can do upfront early on to avoid surprises for users. Also tweak the docs to reflect this new check. Related: #1642 Closes: #1643 Approved by: cgwalters
2018-10-26 20:58:46 +03:00
# Check that add-files with bad paths are rejected
tests/compose: Target FCOS 31, move off of PAPR Again, a lot going on here, but essentially, we adapt the compose tests to run either privileged or fully unprivileged via supermin, just like cosa. I actually got more than halfway through this initially using `cosa build` directly for testing. But in the end, we simply need more flexibility than that. We want to be able to manipulate exactly how rpm-ostree is called, and cosa is very opinionated about this (and may also change from under us in the future). (Another big difference for example is that cosa doesn't care about non-unified mode, whereas we *need* to have coverage for this until we fully kill it.) Really, the most important bit we want from there is the unprivileged-via-supermin bits. So we copy and adapt that here. One obvious improvement then is sharing this code more easily (e.g. a `cosa runasroot` or something?) However, we still use the FCOS manifest (frozen at a specific tag). It's a realistic example, and because of the lockfiles and pool, we get good reproducibility.
2019-12-22 01:42:09 +03:00
treefile_append "add-files" '[["foo.txt", "/var/lib/foo.txt"]]'
if runcompose |& tee err.txt; then
assert_not_reached "Successfully composed with add-files for /var/lib?"
compose: Check that add-files are compatible after parsing While serde gives us type checking, it of course doesn't understand semantics beyond that. One example is checking the compatibility of `add-files` entries with the OSTree model. This is something we can do upfront early on to avoid surprises for users. Also tweak the docs to reflect this new check. Related: #1642 Closes: #1643 Approved by: cgwalters
2018-10-26 20:58:46 +03:00
fi
assert_file_has_content_literal err.txt "Unsupported path in add-files: /var"
echo "ok bad add-files"
Reference in New Issue Copy Permalink