keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e02fff3d5a
rpm-ostree/tests/compose/test-machineid-compat.sh

35 lines
1001 B
Bash
Raw Normal View History

tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +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"
tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +03:00
# Test that `units` and `machineid-compat: False` conflict
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 "units" '["tuned.service"]'
tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +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
# Do the compose
if runcompose |& tee err.txt; then
tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +03:00
assert_not_reached err.txt "Successfully composed with units and machineid-compat=False?"
fi
assert_file_has_content_literal err.txt \
"'units' directive is incompatible with machineid-compat = false"
echo "ok conflict with 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
# Now test machineid-compat: True
# Also test having no ref (XXX: move to misc or something)
treefile_del 'ref'
treefile_set "machineid-compat" 'True'
tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +03:00
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
ostree --repo="${repo}" refs > refs.txt
assert_not_file_has_content refs.txt "${treeref}"
compose: Support not specifying a ref Split out of supporting "pure rojig" work. We also want to support this for doing "oscontainers" as is planned for Red Hat CoreOS. The user experience in both cases is oriented around versioning of the external wrapper, not the inner ref/commit. Note for users/builders who want to make use of this feature: You probably want to mirror the changes in our test suite here to use the compose JSON and parse the resulting `ostree-commit` out of that. Closes: #1603 Approved by: jlebon
2018-10-09 18:23:52 +03:00
echo "ok no refs written"
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
commit=$(jq -r '.["ostree-commit"]' < compose.json)
ostree --repo=${repo} ls ${commit} /usr/etc > ls.txt
assert_file_has_content ls.txt 'machine-id'
tests/compose: Split out machineid-compat test My fix to the testsuite in #1488 in which I made the `machineid-compat` test part of `test-basic.sh` wasn't correct since the basic tests in `libbasic-test.sh` also check that the default behaviour without the `machineid-compat` option is to include it. Let's just do this right and split out the `machineid-compat` test into its own run. Closes: #1491 Approved by: cgwalters
2018-08-07 17:46:47 +03:00
echo "ok machineid-compat"
Reference in New Issue Copy Permalink