keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix "releasever" option, test it by default

Browse Source 
In #875 AKA b46fc35901 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
This commit is contained in:
Colin Walters 2018-01-19 16:20:12 -05:00 committed by Atomic Bot
parent 4f025a6609
commit 3e9c6cf230
7 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libpriv/rpmostree-core.c
View File

@ -247,12 +247,15 @@ rpmostree_treespec_new_from_keyfile (GKeyFile *keyfile,
g_variant_builder_add (&builder, "{sv}", "ref", g_variant_new_string (ref)); g_variant_builder_add (&builder, "{sv}", "ref", g_variant_new_string (ref));
} }
/* See if we're using jigdo */ #define BIND_STRING(k) \
{ g_autofree char *jigdo = g_key_file_get_string (keyfile, "tree", "jigdo", NULL); { g_autofree char *v = g_key_file_get_string (keyfile, "tree", k, NULL); \
if (jigdo) if (v) \
g_variant_builder_add (&builder, "{sv}", "jigdo", g_variant_new_string (jigdo)); g_variant_builder_add (&builder, "{sv}", k, g_variant_new_string (v)); \
} }
BIND_STRING("jigdo");
BIND_STRING("releasever");
add_canonicalized_string_array (&builder, "packages", NULL, keyfile); add_canonicalized_string_array (&builder, "packages", NULL, keyfile);
add_canonicalized_string_array (&builder, "cached-packages", NULL, keyfile); add_canonicalized_string_array (&builder, "cached-packages", NULL, keyfile);
add_canonicalized_string_array (&builder, "removed-base-packages", NULL, keyfile); add_canonicalized_string_array (&builder, "removed-base-packages", NULL, keyfile);

4
tests/common/libcomposetest.sh
View File

@ -20,12 +20,10 @@
setup_rpmmd_repos() { setup_rpmmd_repos() {
dest=$1 dest=$1
shift shift
releasever=${1:-26}
repos=${RPMOSTREE_COMPOSE_TEST_USE_REPOS:-/etc/yum.repos.d} repos=${RPMOSTREE_COMPOSE_TEST_USE_REPOS:-/etc/yum.repos.d}
# When bumping 26 here, also bump fedora.repo, .papr.yml
for x in ${repos}/fedora{,-updates}.repo; do for x in ${repos}/fedora{,-updates}.repo; do
bn=$(basename ${x}) bn=$(basename ${x})
sed -e "s,\$releasever,$releasever," < $x > ${dest}/${bn} cp $x ${dest}/${bn}
done done
} }

29
tests/compose-tests/test-mutate-os-release.sh
View File

@ -4,30 +4,31 @@ set -xeuo pipefail
dn=$(cd $(dirname $0) && pwd) dn=$(cd $(dirname $0) && pwd)
. ${dn}/libcomposetest.sh . ${dn}/libcomposetest.sh
releasever=27
# specifying the key but neither automatic_version_prefix nor # specifying the key but neither automatic_version_prefix nor
# --add-metadata-string should cause no mutation # --add-metadata-string should cause no mutation
prepare_compose_test "mutate-os-release-none" prepare_compose_test "mutate-os-release-none"
pysetjsonmember "mutate-os-release" '"26"' pysetjsonmember "mutate-os-release" '"'${releasever}'"'
runcompose runcompose
echo "ok compose (none)" echo "ok compose (none)"
ostree --repo=${repobuild} cat ${treeref} \ ostree --repo=${repobuild} cat ${treeref} \
/usr/lib/os.release.d/os-release-fedora > os-release.prop /usr/lib/os.release.d/os-release-fedora > os-release.prop
assert_file_has_content os-release.prop VERSION_ID=26 assert_file_has_content os-release.prop VERSION_ID=${releasever}
assert_not_file_has_content os-release.prop OSTREE_VERSION= assert_not_file_has_content os-release.prop OSTREE_VERSION=
assert_file_has_content os-release.prop 'VERSION="26 (Twenty Six)"' assert_file_has_content os-release.prop 'VERSION="'${releasever}' (Twenty '
echo "ok mutate-os-release-none" echo "ok mutate-os-release-none"
# make sure --add-metadata-string has precedence and works with # make sure --add-metadata-string has precedence and works with
# mutate-os-release # mutate-os-release
prepare_compose_test "mutate-os-release-cli" prepare_compose_test "mutate-os-release-cli"
pysetjsonmember "automatic_version_prefix" '"26.555"' pysetjsonmember "automatic_version_prefix" '"'${releasever}'.555"'
pysetjsonmember "mutate-os-release" '"26"' pysetjsonmember "mutate-os-release" '"'${releasever}'"'
runcompose --add-metadata-string=version=26.444 runcompose --add-metadata-string=version=${releasever}.444
echo "ok compose (cli)" echo "ok compose (cli)"
ostree --repo=${repobuild} cat ${treeref} \ ostree --repo=${repobuild} cat ${treeref} \
@ -35,16 +36,16 @@ ostree --repo=${repobuild} cat ${treeref} \
# VERSION_ID *shouldn't* change # VERSION_ID *shouldn't* change
# (https://github.com/projectatomic/rpm-ostree/pull/433) # (https://github.com/projectatomic/rpm-ostree/pull/433)
assert_file_has_content os-release.prop VERSION_ID=26 assert_file_has_content os-release.prop VERSION_ID=${releasever}
assert_file_has_content os-release.prop OSTREE_VERSION=26.444 assert_file_has_content os-release.prop OSTREE_VERSION=${releasever}.444
assert_file_has_content os-release.prop 'VERSION="26\.444 (Twenty Six)"' assert_file_has_content os-release.prop 'VERSION="'${releasever}'\.444 (Twenty '
echo "ok mutate-os-release-cli" echo "ok mutate-os-release-cli"
# make sure automatic_version_prefix works # make sure automatic_version_prefix works
prepare_compose_test "mutate-os-release-auto" prepare_compose_test "mutate-os-release-auto"
pysetjsonmember "automatic_version_prefix" '"26.555"' pysetjsonmember "automatic_version_prefix" '"'${releasever}'.555"'
pysetjsonmember "mutate-os-release" '"26"' pysetjsonmember "mutate-os-release" '"'${releasever}'"'
runcompose runcompose
echo "ok compose (auto)" echo "ok compose (auto)"
@ -53,7 +54,7 @@ ostree --repo=${repobuild} cat ${treeref} \
# VERSION_ID *shouldn't* change # VERSION_ID *shouldn't* change
# (https://github.com/projectatomic/rpm-ostree/pull/433) # (https://github.com/projectatomic/rpm-ostree/pull/433)
assert_file_has_content os-release.prop VERSION_ID=26 assert_file_has_content os-release.prop VERSION_ID=${releasever}
assert_file_has_content os-release.prop OSTREE_VERSION=26.555 assert_file_has_content os-release.prop OSTREE_VERSION=${releasever}.555
assert_file_has_content os-release.prop 'VERSION="26\.555 (Twenty Six)"' assert_file_has_content os-release.prop 'VERSION="'${releasever}'\.555 (Twenty '
echo "ok mutate-os-release (auto)" echo "ok mutate-os-release (auto)"

1
tests/composedata/fedora-base.json
View File

@ -1,5 +1,6 @@
{ {
"ref": "fedora/stable/${basearch}", "ref": "fedora/stable/${basearch}",
"releasever": "27",
"repos": ["fedora", "updates"], "repos": ["fedora", "updates"],

3
tests/ex-container
View File

@ -25,8 +25,7 @@ trap cleanup_tmp EXIT
cd ${tmpdir} cd ${tmpdir}
rpm-ostree ex container init rpm-ostree ex container init
# Need 27 due to http://bugzilla.redhat.com/1478172 only built there setup_rpmmd_repos ${tmpdir}/rpmmd.repos.d
setup_rpmmd_repos ${tmpdir}/rpmmd.repos.d 27
echo "Results in ${LOGDIR}" echo "Results in ${LOGDIR}"
rm ${LOGDIR} -rf rm ${LOGDIR} -rf

2
tests/ex-container-tests/test-bash.sh
View File

@ -11,6 +11,7 @@ cat >bash.conf <<EOF
ref=bash ref=bash
packages=coreutils;bash; packages=coreutils;bash;
repos=fedora; repos=fedora;
releasever=27
EOF EOF
rpm-ostree ex container assemble bash.conf rpm-ostree ex container assemble bash.conf
@ -24,6 +25,7 @@ cat >bash-nodocs.conf <<EOF
ref=bash-nodocs ref=bash-nodocs
packages=coreutils;bash; packages=coreutils;bash;
repos=fedora; repos=fedora;
releasever=27
documentation=false; documentation=false;
EOF EOF

1
tests/ex-container-tests/test-httpd.sh
View File

@ -11,6 +11,7 @@ cat >httpd.conf <<EOF
ref=httpd ref=httpd
packages=httpd; packages=httpd;
repos=fedora; repos=fedora;
releasever=27
EOF EOF
# This one has non-root ownership in some of the dependencies, but we shouldn't # This one has non-root ownership in some of the dependencies, but we shouldn't