diff options
author | Colin Walters <walters@verbum.org> | 2017-03-24 10:35:59 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-03-24 22:16:43 +0000 |
commit | 455cc5e8926350cf4386792090068ff71af08f15 (patch) | |
tree | 9c626a9034e23257fbfbe0b5a99111416c1ab282 /tests/test-prune.sh | |
parent | 4d873389f0aae45e18c8c40b2b868b8264beaade (diff) | |
download | ostree-455cc5e8926350cf4386792090068ff71af08f15.tar.gz |
repo+tests: Add [core]disable-xattrs=true, use it on overlayfs
There are a lot of things suboptimal about this approach, but
on the other hand we need to get our CI back up and running.
The basic approach is to - in the test suite, detect if we're on overlayfs. If
so, set a flag in the repo, which gets picked up by a few strategic places in
the core to turn on "ignore xattrs".
I also had to add a variant of this for the sysroot work.
The core problem here is while overlayfs will let us read and
see the SELinux labels, it won't let us write them.
Down the line, we should improve this so that we can selectively ignore e.g.
`security.*` attributes but not `user.*` say.
Closes: https://github.com/ostreedev/ostree/issues/758
Closes: #759
Approved by: jlebon
Diffstat (limited to 'tests/test-prune.sh')
-rwxr-xr-x | tests/test-prune.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test-prune.sh b/tests/test-prune.sh index 51ec7948..0781b543 100755 --- a/tests/test-prune.sh +++ b/tests/test-prune.sh @@ -29,7 +29,7 @@ echo '1..5' cd ${test_tmpdir} mkdir repo -${CMD_PREFIX} ostree --repo=repo init +ostree_repo_init repo ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo mkdir -p tree/root @@ -142,7 +142,7 @@ assert_file_has_content deltascount "^1$" echo "ok prune" rm repo -rf -${CMD_PREFIX} ostree --repo=repo init --mode=bare-user +ostree_repo_init repo --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 ${CMD_PREFIX} ostree --repo=repo prune @@ -158,7 +158,7 @@ assert_has_n_objects() { cd ${test_tmpdir} for repo in repo child-repo tmp-repo; do rm ${repo} -rf - ${CMD_PREFIX} ostree --repo=${repo} init --mode=archive + ostree_repo_init ${repo} --mode=archive done echo parent=${test_tmpdir}/repo >> child-repo/config mkdir files @@ -189,7 +189,7 @@ echo "ok prune with parent repo" # would interact. We make a new repo test suite, then clone it # for "subtests" below with reinitialize_datesnap_repo() rm repo datetest-snapshot-repo -rf -${CMD_PREFIX} ostree --repo=datetest-snapshot-repo init --mode=archive +ostree_repo_init datetest-snapshot-repo --mode=archive # Some ancient commits on the both a stable/dev branch for day in $(seq 5); do ${CMD_PREFIX} ostree --repo=datetest-snapshot-repo commit --branch=stable -m test -s "old stable build $day" tree --timestamp="October $day 1985" @@ -206,7 +206,7 @@ assert_file_has_content commitcount "^16$" # Snapshot the above reinitialize_datesnap_repo() { rm repo -rf - ${CMD_PREFIX} ostree --repo=repo init --mode=archive + ostree_repo_init repo --mode=archive ${CMD_PREFIX} ostree --repo=repo pull-local --depth=-1 datetest-snapshot-repo } |