mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-09 01:18:35 +03:00
tests: add missing ${CMD_PREFIX} before ostree
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #242 Approved by: cgwalters
This commit is contained in:
parent
039d3f1dbd
commit
7763c452dd
@ -42,14 +42,14 @@ exampleos_build_commit_package() {
|
||||
mkdir -p ${pkg}-package/usr/bin/
|
||||
echo "${pkg}-content ${version}" > ${pkg}-package/usr/bin/${pkg}
|
||||
# Use a dummy subject for this.
|
||||
ostree --repo=build-repo commit -b exampleos/x86_64/${pkg} -s '' --tree=dir=${pkg}-package
|
||||
${CMD_PREFIX} ostree --repo=build-repo commit -b exampleos/x86_64/${pkg} -s '' --tree=dir=${pkg}-package
|
||||
rm ${pkg}-package -rf
|
||||
}
|
||||
|
||||
exampleos_recompose() {
|
||||
rm exampleos-build -rf
|
||||
for pkg in ${packages}; do
|
||||
ostree --repo=build-repo checkout -U --union exampleos/x86_64/${pkg} exampleos-build
|
||||
${CMD_PREFIX} ostree --repo=build-repo checkout -U --union exampleos/x86_64/${pkg} exampleos-build
|
||||
done
|
||||
|
||||
# Now that we have our rootfs, run triggers
|
||||
@ -60,15 +60,15 @@ exampleos_recompose() {
|
||||
# Then we commit it, using --link-checkout-speedup to effectively
|
||||
# only re-checksum the ldconfig file. We also have dummy commit
|
||||
# message here.
|
||||
ostree --repo=build-repo commit -b exampleos/x86_64/standard -s 'exampleos build' --link-checkout-speedup exampleos-build
|
||||
${CMD_PREFIX} ostree --repo=build-repo commit -b exampleos/x86_64/standard -s 'exampleos build' --link-checkout-speedup exampleos-build
|
||||
}
|
||||
|
||||
packages="bash systemd"
|
||||
|
||||
mkdir build-repo
|
||||
ostree --repo=build-repo init --mode=bare-user
|
||||
${CMD_PREFIX} ostree --repo=build-repo init --mode=bare-user
|
||||
mkdir repo
|
||||
ostree --repo=repo init --mode=archive-z2
|
||||
${CMD_PREFIX} ostree --repo=repo init --mode=archive-z2
|
||||
# Our FUSE mount point
|
||||
mkdir mnt
|
||||
|
||||
@ -81,7 +81,7 @@ exampleos_build_commit_package systemd 224
|
||||
exampleos_recompose
|
||||
|
||||
# This is our first commit - let's publish it.
|
||||
ostree --repo=repo pull-local build-repo exampleos/x86_64/standard
|
||||
${CMD_PREFIX} ostree --repo=repo pull-local build-repo exampleos/x86_64/standard
|
||||
|
||||
# Now, update the bash package - this is a new commit on the branch
|
||||
# exampleos/x86_64/bash.
|
||||
@ -91,11 +91,11 @@ exampleos_build_commit_package bash 0.5.0
|
||||
exampleos_recompose
|
||||
|
||||
# Publish again:
|
||||
ostree --repo=repo pull-local build-repo exampleos/x86_64/standard
|
||||
${CMD_PREFIX} ostree --repo=repo pull-local build-repo exampleos/x86_64/standard
|
||||
# Optional: Generate a static delta vs the previous build
|
||||
ostree --repo=repo static-delta generate exampleos/x86_64/standard
|
||||
${CMD_PREFIX} ostree --repo=repo static-delta generate exampleos/x86_64/standard
|
||||
# Optional: Regenerate the summary file
|
||||
ostree --repo=repo summary -u
|
||||
${CMD_PREFIX} ostree --repo=repo summary -u
|
||||
|
||||
# Try: ostree --repo=demo-repo ls -R exampleos/x86_64/standard
|
||||
|
||||
|
@ -130,9 +130,9 @@ assert_file_has_content deltascount "^1$"
|
||||
echo "ok prune"
|
||||
|
||||
rm repo -rf
|
||||
ostree --repo=repo init --mode=bare-user
|
||||
${CMD_PREFIX} ostree --repo=repo init --mode=bare-user
|
||||
${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo
|
||||
${CMD_PREFIX} ostree --repo=repo pull --depth=-1 --commit-metadata-only origin test
|
||||
ostree --repo=repo prune
|
||||
${CMD_PREFIX} ostree --repo=repo prune
|
||||
|
||||
echo "ok prune with partial repo"
|
||||
|
Loading…
Reference in New Issue
Block a user