keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8ab604d098
rpm-ostree/tests/compose/test-write-commitid.sh

25 lines
712 B
Bash
Raw Normal View History

tests/compose: Add a test for --write-commitid-to This is used in critical paths like pungi, so let's be sure it works; the semantics are a bit subtle as it overrides setting the ref. Closes: #1161 Approved by: jlebon
2017-12-19 17:36:43 +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: Add a test for --write-commitid-to This is used in critical paths like pungi, so let's be sure it works; the semantics are a bit subtle as it overrides setting the ref. Closes: #1161 Approved by: jlebon
2017-12-19 17:36:43 +03:00
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
runcompose --write-commitid-to $(pwd)/commitid.txt
tests/compose: Add a test for --write-commitid-to This is used in critical paths like pungi, so let's be sure it works; the semantics are a bit subtle as it overrides setting the ref. Closes: #1161 Approved by: jlebon
2017-12-19 17:36:43 +03:00
wc -c < commitid.txt > wc.txt
assert_file_has_content_literal wc.txt 64
echo "ok compose"
# --write-commitid-to should not set the ref
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_file_empty refs.txt
tests/compose: Add a test for --write-commitid-to This is used in critical paths like pungi, so let's be sure it works; the semantics are a bit subtle as it overrides setting the ref. Closes: #1161 Approved by: jlebon
2017-12-19 17:36:43 +03:00
echo "ok ref not written"
compose: Add --write-composejson-to For higher level tools driving rpm-ostree, the command line arguments are mostly OK as inputs, but the addition of `--write-commitid-to` shows that we really want structured data that these tools can parse. JSON is a good enough interchange format, let's use that. Most notably this does a pkgdiff in the JSON which several higher level tools do too. Closes: #1529 Approved by: jlebon
2018-09-06 18:22:39 +03:00
commitid_txt=$(cat commitid.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_streq "$(jq -r '.["ostree-commit"]' < compose.json)" "${commitid_txt}"
compose: Add --write-composejson-to For higher level tools driving rpm-ostree, the command line arguments are mostly OK as inputs, but the addition of `--write-commitid-to` shows that we really want structured data that these tools can parse. JSON is a good enough interchange format, let's use that. Most notably this does a pkgdiff in the JSON which several higher level tools do too. Closes: #1529 Approved by: jlebon
2018-09-06 18:22:39 +03:00
# And verify we have other keys
for key in ostree-version rpm-ostree-inputhash ostree-content-bytes-written; 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
jq -r '.["'${key}'"]' compose.json >/dev/null
compose: Add --write-composejson-to For higher level tools driving rpm-ostree, the command line arguments are mostly OK as inputs, but the addition of `--write-commitid-to` shows that we really want structured data that these tools can parse. JSON is a good enough interchange format, let's use that. Most notably this does a pkgdiff in the JSON which several higher level tools do too. Closes: #1529 Approved by: jlebon
2018-09-06 18:22:39 +03:00
done
echo "ok composejson"
Reference in New Issue Copy Permalink