keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1fbf4b8ba4
rpm-ostree/tests/compose/test-mutate-os-release.sh

62 lines
2.2 KiB
Bash
Raw Normal View History

compose-tests: add more tests Add a few more tests to exercise some of the treefile options. We do need to also expand test-basic.sh itself to sanity-check the structure of a normal ostree compose. That's up next on the list. Closes: #548 Approved by: cgwalters
2016-12-09 01:31:20 +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"
# make sure we clear out postprocess scripts, which might be using os-release
treefile_set "postprocess" '[]'
compose-tests: add more tests Add a few more tests to exercise some of the treefile options. We do need to also expand test-basic.sh itself to sanity-check the structure of a normal ostree compose. That's up next on the list. Closes: #548 Approved by: cgwalters
2016-12-09 01:31:20 +03:00
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
releasever=$(jq -r .releasever "${treefile}")
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
# specifying the key but neither automatic_version_prefix nor
# --add-metadata-string should cause no mutation
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 "mutate-os-release" '"'${releasever}'"'
treefile_del 'automatic-version-prefix'
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
runcompose
echo "ok compose (none)"
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/lib/os-release > os-release.prop
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
Fix "releasever" option, test it by default In #875 AKA b46fc35901acb18a3cbf01fd10bce16acd727650 we added support for the `releasever` option in treefiles. I am pretty sure it worked at the time...but I didn't add tests. Either it never worked or some refactoring broke it. The whole chain of `GKeyFile` → `GVariant` is so confusing. Anyways fix it by copying the string. Now let's use it by default in the compose tests, and while we're here bump those to F27. I'm doing this patch now as I was playing with doing a compose from the `/usr/share/rpm-ostree/treefile.json` and wanted to use the stock `.repo` files. Closes: #1220 Approved by: jlebon
2018-01-20 00:20:12 +03:00
assert_file_has_content os-release.prop VERSION_ID=${releasever}
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
assert_not_file_has_content os-release.prop OSTREE_VERSION=
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 os-release.prop 'VERSION="'${releasever}' (CoreOS'
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
echo "ok mutate-os-release-none"
# make sure --add-metadata-string has precedence and works with
# mutate-os-release
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 "automatic-version-prefix" '"'${releasever}'.555"'
treefile_set "mutate-os-release" '"'${releasever}'"'
Fix "releasever" option, test it by default In #875 AKA b46fc35901acb18a3cbf01fd10bce16acd727650 we added support for the `releasever` option in treefiles. I am pretty sure it worked at the time...but I didn't add tests. Either it never worked or some refactoring broke it. The whole chain of `GKeyFile` → `GVariant` is so confusing. Anyways fix it by copying the string. Now let's use it by default in the compose tests, and while we're here bump those to F27. I'm doing this patch now as I was playing with doing a compose from the `/usr/share/rpm-ostree/treefile.json` and wanted to use the stock `.repo` files. Closes: #1220 Approved by: jlebon
2018-01-20 00:20:12 +03:00
runcompose --add-metadata-string=version=${releasever}.444
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
echo "ok compose (cli)"
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/lib/os-release > os-release.prop
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
# VERSION_ID *shouldn't* change
# (https://github.com/projectatomic/rpm-ostree/pull/433)
Fix "releasever" option, test it by default In #875 AKA b46fc35901acb18a3cbf01fd10bce16acd727650 we added support for the `releasever` option in treefiles. I am pretty sure it worked at the time...but I didn't add tests. Either it never worked or some refactoring broke it. The whole chain of `GKeyFile` → `GVariant` is so confusing. Anyways fix it by copying the string. Now let's use it by default in the compose tests, and while we're here bump those to F27. I'm doing this patch now as I was playing with doing a compose from the `/usr/share/rpm-ostree/treefile.json` and wanted to use the stock `.repo` files. Closes: #1220 Approved by: jlebon
2018-01-20 00:20:12 +03:00
assert_file_has_content os-release.prop VERSION_ID=${releasever}
postprocess: Quote OSTREE_VERSION value Use g_shell_quote to quote the value set for OSTREE_VERSION in /etc/os-release as this is an arbitrary string set at compose time that may contain whitespace or other special characters. This edge case was found in [0] as the compose are built with the following command: $ rpm-ostree compose tree \ --repo="repo" \ --cachedir="cache" \ --add-metadata-string="version=Kinoite 30.23" \ "fedora-kinoite.yaml" [0] https://discussion.fedoraproject.org/t/kinoite-a-kde-and-now-xfce-version-of-fedora-silverblue/147/95 Signed-off-by: Timothée Ravier <tim@siosm.fr> Closes: #1873 Approved by: jlebon
2019-07-21 15:27:28 +03:00
assert_file_has_content os-release.prop OSTREE_VERSION=\'${releasever}.444\'
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 os-release.prop 'VERSION="'${releasever}'\.444 (CoreOS'
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
echo "ok mutate-os-release-cli"
# make sure automatic_version_prefix works
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 "automatic-version-prefix" '"'${releasever}'.555"'
treefile_set "mutate-os-release" '"'${releasever}'"'
runcompose --force-nocache
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
echo "ok compose (auto)"
compose-tests: add more tests Add a few more tests to exercise some of the treefile options. We do need to also expand test-basic.sh itself to sanity-check the structure of a normal ostree compose. That's up next on the list. Closes: #548 Approved by: cgwalters
2016-12-09 01:31:20 +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
ostree --repo=${repo} cat ${treeref} \
/usr/lib/os-release > os-release.prop
compose-tests: add more tests Add a few more tests to exercise some of the treefile options. We do need to also expand test-basic.sh itself to sanity-check the structure of a normal ostree compose. That's up next on the list. Closes: #548 Approved by: cgwalters
2016-12-09 01:31:20 +03:00
# VERSION_ID *shouldn't* change
# (https://github.com/projectatomic/rpm-ostree/pull/433)
Fix "releasever" option, test it by default In #875 AKA b46fc35901acb18a3cbf01fd10bce16acd727650 we added support for the `releasever` option in treefiles. I am pretty sure it worked at the time...but I didn't add tests. Either it never worked or some refactoring broke it. The whole chain of `GKeyFile` → `GVariant` is so confusing. Anyways fix it by copying the string. Now let's use it by default in the compose tests, and while we're here bump those to F27. I'm doing this patch now as I was playing with doing a compose from the `/usr/share/rpm-ostree/treefile.json` and wanted to use the stock `.repo` files. Closes: #1220 Approved by: jlebon
2018-01-20 00:20:12 +03:00
assert_file_has_content os-release.prop VERSION_ID=${releasever}
postprocess: Quote OSTREE_VERSION value Use g_shell_quote to quote the value set for OSTREE_VERSION in /etc/os-release as this is an arbitrary string set at compose time that may contain whitespace or other special characters. This edge case was found in [0] as the compose are built with the following command: $ rpm-ostree compose tree \ --repo="repo" \ --cachedir="cache" \ --add-metadata-string="version=Kinoite 30.23" \ "fedora-kinoite.yaml" [0] https://discussion.fedoraproject.org/t/kinoite-a-kde-and-now-xfce-version-of-fedora-silverblue/147/95 Signed-off-by: Timothée Ravier <tim@siosm.fr> Closes: #1873 Approved by: jlebon
2019-07-21 15:27:28 +03:00
assert_file_has_content os-release.prop OSTREE_VERSION=\'${releasever}.555\'
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 os-release.prop 'VERSION="'${releasever}'\.555 (CoreOS'
compose-tests: add more mutate-os-release cases Check that the logic added in the previous commit is respected. Closes: #603 Approved by: cgwalters
2017-02-01 20:16:09 +03:00
echo "ok mutate-os-release (auto)"
Reference in New Issue Copy Permalink