packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Giuseppe Scrivano 2016-04-07 09:55:54 +02:00 committed by Colin Walters (automation)
parent 039d3f1dbd
commit 7763c452dd
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test-demo-buildsystem.sh
View File

@ -42,14 +42,14 @@ exampleos_build_commit_package() {
mkdir -p ${pkg}-package/usr/bin/ mkdir -p ${pkg}-package/usr/bin/
echo "${pkg}-content ${version}" > ${pkg}-package/usr/bin/${pkg} echo "${pkg}-content ${version}" > ${pkg}-package/usr/bin/${pkg}
# Use a dummy subject for this. # 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 rm ${pkg}-package -rf
} }
exampleos_recompose() { exampleos_recompose() {
rm exampleos-build -rf rm exampleos-build -rf
for pkg in ${packages}; do 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 done
# Now that we have our rootfs, run triggers # Now that we have our rootfs, run triggers
@ -60,15 +60,15 @@ exampleos_recompose() {
# Then we commit it, using --link-checkout-speedup to effectively # Then we commit it, using --link-checkout-speedup to effectively
# only re-checksum the ldconfig file. We also have dummy commit # only re-checksum the ldconfig file. We also have dummy commit
# message here. # 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" packages="bash systemd"
mkdir build-repo mkdir build-repo
ostree --repo=build-repo init --mode=bare-user ${CMD_PREFIX} ostree --repo=build-repo init --mode=bare-user
mkdir repo mkdir repo
ostree --repo=repo init --mode=archive-z2 ${CMD_PREFIX} ostree --repo=repo init --mode=archive-z2
# Our FUSE mount point # Our FUSE mount point
mkdir mnt mkdir mnt
@ -81,7 +81,7 @@ exampleos_build_commit_package systemd 224
exampleos_recompose exampleos_recompose
# This is our first commit - let's publish it. # 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 # Now, update the bash package - this is a new commit on the branch
# exampleos/x86_64/bash. # exampleos/x86_64/bash.
@ -91,11 +91,11 @@ exampleos_build_commit_package bash 0.5.0
exampleos_recompose exampleos_recompose
# Publish again: # 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 # 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 # 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 # Try: ostree --repo=demo-repo ls -R exampleos/x86_64/standard

4
tests/test-prune.sh
View File

@ -130,9 +130,9 @@ assert_file_has_content deltascount "^1$"
echo "ok prune" echo "ok prune"
rm repo -rf 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 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 ${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" echo "ok prune with partial repo"