f098d22e03
Our trick of using layered commits as base commit updates doesn't jive well with the new opportunistic reuse of the base rpmdb. The issue is that a layered commit includes the rpmdb of *its* base commit at the `/usr/lib/sysimage` location. So to convert it into a proper base commit means that the layered rpmdb should move there. Closes: #1502 Approved by: cgwalters
201 lines
8.4 KiB
Bash
Executable File
201 lines
8.4 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (C) 2017 Red Hat, Inc.
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
set -euo pipefail
|
|
|
|
. ${commondir}/libtest.sh
|
|
. ${commondir}/libvm.sh
|
|
|
|
set -x
|
|
|
|
YUMREPO=/var/tmp/vmcheck/yumrepo/packages/x86_64
|
|
|
|
# create a new vmcheck commit which has foo and bar in it already
|
|
|
|
# make sure the packages are not already layered
|
|
vm_assert_layered_pkg foo absent
|
|
vm_assert_layered_pkg bar absent
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-checksum"]|not' \
|
|
'.deployments[0]["pending-base-checksum"]|not' \
|
|
'.deployments[0]["base-local-replacements"]|length == 0' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 0'
|
|
|
|
vm_cmd ostree refs $(vm_get_booted_csum) --create vmcheck_tmp/without_foo_and_bar
|
|
|
|
# create a new branch with foo
|
|
vm_build_rpm foo
|
|
vm_build_rpm bar
|
|
vm_build_rpm fooext requires "foo = 1.0-1"
|
|
vm_rpmostree install fooext bar
|
|
vm_cmd ostree refs $(vm_get_deployment_info 0 checksum) \
|
|
--create vmcheck_tmp/with_foo_and_bar
|
|
vm_rpmostree cleanup -p
|
|
|
|
# upgrade to new commit with foo in the base layer
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/with_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_reboot
|
|
if ! vm_has_packages foo bar fooext; then
|
|
assert_not_reached "foo, fooext, or bar not in base layer"
|
|
fi
|
|
echo "ok setup"
|
|
|
|
assert_replaced_local_pkg() {
|
|
old_nevra=$1; shift
|
|
new_nevra=$1; shift
|
|
|
|
# funky jq syntax here: base-local-replacements is a list of (new, old)
|
|
# tuples. The first [] is to print out all the tuples, the following [0/1] is
|
|
# to access the new/old element of the tuple, and the [0] is to access the
|
|
# nevra. We wrap the whole thing in [...] so that we get a list of nevra
|
|
# strings to which we can then apply the index filter.
|
|
|
|
vm_assert_status_jq \
|
|
"[.deployments[0][\"base-local-replacements\"][][0][0]]|index(\"$new_nevra\") >= 0" \
|
|
"[.deployments[0][\"base-local-replacements\"][][1][0]]|index(\"$old_nevra\") >= 0" \
|
|
".deployments[0][\"requested-base-local-replacements\"]|index(\"$new_nevra\") >= 0"
|
|
root=$(vm_get_deployment_root 0)
|
|
if ! vm_cmd rpm --dbpath $root/usr/share/rpm -q $new_nevra; then
|
|
assert_not_reached "new pkg not in rpmdb?"
|
|
fi
|
|
name=${new_nevra%%-*}
|
|
if ! vm_cmd $root/usr/bin/$name | grep -q $new_nevra; then
|
|
assert_not_reached "new pkg not in tree?"
|
|
fi
|
|
}
|
|
|
|
# try to replace foo without replacing the extension
|
|
vm_build_rpm foo version 2.0
|
|
if vm_rpmostree override replace $YUMREPO/foo-2.0-1.x86_64.rpm 2>err.txt; then
|
|
assert_not_reached "successfully replaced foo without fooext?"
|
|
fi
|
|
assert_file_has_content err.txt "fooext"
|
|
echo "ok failed to replace foo without fooext"
|
|
|
|
vm_build_rpm fooext version 2.0 requires "foo = 2.0-1"
|
|
vm_rpmostree override replace $YUMREPO/foo{,ext}-2.0-1.x86_64.rpm
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 2' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 2'
|
|
assert_replaced_local_pkg foo-1.0-1.x86_64 foo-2.0-1.x86_64
|
|
assert_replaced_local_pkg fooext-1.0-1.x86_64 fooext-2.0-1.x86_64
|
|
vm_cmd rpm-ostree status > status.txt
|
|
assert_file_has_content status.txt '\(foo fooext\|fooext foo\) 1\.0-1 -> 2\.0-1'
|
|
echo "ok override replace foo and fooext"
|
|
|
|
# replace bar with older version
|
|
vm_build_rpm bar version 0.9
|
|
vm_rpmostree override replace $YUMREPO/bar-0.9-1.x86_64.rpm
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 3' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 3'
|
|
assert_replaced_local_pkg foo-1.0-1.x86_64 foo-2.0-1.x86_64
|
|
assert_replaced_local_pkg fooext-1.0-1.x86_64 fooext-2.0-1.x86_64
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
vm_cmd rpm-ostree status > status.txt
|
|
assert_file_has_content status.txt '\(foo fooext\|fooext foo\) 1\.0-1 -> 2\.0-1'
|
|
assert_file_has_content_literal status.txt 'bar 1.0-1 -> 0.9-1'
|
|
echo "ok override replace bar"
|
|
|
|
vm_cmd ostree commit -b vmcheck --tree=ref=vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 3' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 3'
|
|
assert_replaced_local_pkg foo-1.0-1.x86_64 foo-2.0-1.x86_64
|
|
assert_replaced_local_pkg fooext-1.0-1.x86_64 fooext-2.0-1.x86_64
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
echo "ok override replacements carried through upgrade"
|
|
|
|
# try to reset pkgs using both name and nevra
|
|
vm_rpmostree override reset foo fooext-2.0-1.x86_64
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1'
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
echo "ok override reset foo and fooext using name and nevra"
|
|
|
|
vm_rpmostree override reset --all
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-removals"]|length == 0' \
|
|
'.deployments[0]["requested-base-removals"]|length == 0' \
|
|
'.deployments[0]["base-local-replacements"]|length == 0' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 0'
|
|
echo "ok override reset --all"
|
|
|
|
vm_rpmostree cleanup -p
|
|
|
|
# test inactive replacements
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/with_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_rpmostree override replace $YUMREPO/bar-0.9-1.x86_64.rpm
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1'
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/without_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 0' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|index("bar-0.9-1.x86_64") >= 0'
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/with_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1'
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
echo "ok active -> inactive -> active override replace"
|
|
|
|
# make sure we can reset it while it's inactive
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/without_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 0' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|index("bar-0.9-1.x86_64") >= 0'
|
|
vm_rpmostree override reset bar-0.9-1.x86_64
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 0' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 0'
|
|
echo "ok reset inactive override replace"
|
|
|
|
vm_rpmostree cleanup -p
|
|
|
|
# try both local package layering and local replacements to make sure fd sending
|
|
# doesn't get mixed up; and also remove a package at the same time
|
|
vm_build_rpm baz
|
|
vm_ostree_commit_layered_as_base vmcheck_tmp/with_foo_and_bar vmcheck
|
|
vm_rpmostree upgrade
|
|
vm_rpmostree override replace $YUMREPO/bar-0.9-1.x86_64.rpm \
|
|
--install $YUMREPO/baz-1.0-1.x86_64.rpm \
|
|
--remove foo --remove fooext
|
|
vm_assert_status_jq \
|
|
'.deployments[0]["base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-base-local-replacements"]|length == 1' \
|
|
'.deployments[0]["requested-local-packages"]|length == 1' \
|
|
'.deployments[0]["requested-local-packages"]|index("baz-1.0-1.x86_64") >= 0' \
|
|
'.deployments[0]["base-removals"]|length == 2' \
|
|
'[.deployments[0]["base-removals"][][.0]]|index("foo-1.0-1.x86_64") >= 0' \
|
|
'.deployments[0]["requested-base-removals"]|length == 2' \
|
|
'.deployments[0]["requested-base-removals"]|index("foo") >= 0'
|
|
assert_replaced_local_pkg bar-1.0-1.x86_64 bar-0.9-1.x86_64
|
|
echo "ok local replace and local layering"
|