9daea46d66
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.
61 lines
2.1 KiB
Bash
Executable File
61 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
set -xeuo pipefail
|
|
|
|
dn=$(cd "$(dirname "$0")" && pwd)
|
|
# shellcheck source=libcomposetest.sh
|
|
. "${dn}/libcomposetest.sh"
|
|
|
|
# This is used to test postprocessing with treefile vs not
|
|
treefile_set "boot-location" '"new"'
|
|
|
|
# This test is a bit of a degenerative case of the supermin abstration. We need
|
|
# to be able to interact with the compose output directly, feed it back to
|
|
# rpm-ostree, etc... So we just run whole scripts inside the VM.
|
|
|
|
instroot_tmp=cache/instroot
|
|
instroot=${instroot_tmp}/rootfs
|
|
integrationconf=usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf
|
|
runasroot sh -xec "
|
|
mkdir -p ${instroot_tmp}
|
|
rpm-ostree compose install ${compose_base_argv} ${treefile} ${instroot_tmp}
|
|
|
|
! test -d ${instroot}/etc
|
|
test -L ${instroot}/home
|
|
test -d ${instroot}/usr/etc
|
|
|
|
# Clone the root - we'll test direct commit, as well as postprocess with
|
|
# and without treefile.
|
|
mv ${instroot}{,-postprocess}
|
|
cp -al ${instroot}{-postprocess,-directcommit}
|
|
cp -al ${instroot}{-postprocess,-postprocess-treefile}
|
|
|
|
|
|
! test -f ${instroot}-postprocess/${integrationconf}
|
|
rpm-ostree compose postprocess ${instroot}-postprocess
|
|
test -f ${instroot}-postprocess/${integrationconf}
|
|
ostree --repo=${repo} commit -b test-directcommit --selinux-policy ${instroot}-postprocess --tree=dir=${instroot}-postprocess
|
|
"
|
|
echo "ok postprocess + direct commit"
|
|
|
|
runasroot sh -xec "
|
|
rpm-ostree compose postprocess ${instroot}-postprocess-treefile ${treefile}
|
|
test -f ${instroot}-postprocess-treefile/${integrationconf}
|
|
# with treefile, no kernels in /boot
|
|
ls ${instroot}-postprocess-treefile/boot > ls.txt
|
|
! grep '^vmlinuz-' ls.txt
|
|
rm -f ls.txt
|
|
"
|
|
echo "ok postprocess with treefile"
|
|
|
|
testdate=$(date)
|
|
runasroot sh -xec "
|
|
echo \"${testdate}\" > ${instroot}-directcommit/usr/share/rpm-ostree-composetest-split.txt
|
|
! test -f ${instroot}-directcommit/${integrationconf}
|
|
rpm-ostree compose commit --repo=${repo} ${treefile} ${instroot}-directcommit
|
|
ostree --repo=${repo} ls ${treeref} /usr/bin/bash
|
|
ostree --repo=${repo} cat ${treeref} /usr/share/rpm-ostree-composetest-split.txt >out.txt
|
|
grep \"${testdate}\" out.txt
|
|
ostree --repo=${repo} cat ${treeref} /${integrationconf}
|
|
"
|
|
echo "ok installroot"
|