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

Merge pull request #2102 from cgwalters/test-clockskew-check 

ci: Test for clock skew
This commit is contained in:
OpenShift Merge Robot 2020-05-18 21:39:30 +02:00 committed by GitHub
parent 0d7132ec79 f14aa894d3
commit 5a82d75adb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/admin-test.sh
View File

@ -306,6 +306,8 @@ prev_rev=$(${CMD_PREFIX} ostree rev-parse --repo=sysroot/ostree/repo testos/buil
assert_not_streq ${head_rev} ${prev_rev} assert_not_streq ${head_rev} ${prev_rev}
# check that we can't "upgrade" to an older commit without --allow-downgrade # check that we can't "upgrade" to an older commit without --allow-downgrade
if ${CMD_PREFIX} ostree admin upgrade --os=testos --override-commit=${prev_rev} 2> err.txt; then if ${CMD_PREFIX} ostree admin upgrade --os=testos --override-commit=${prev_rev} 2> err.txt; then
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo show "${prev_rev}"
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo show "${head_rev}"
fatal "downgraded without --allow-downgrade?" fatal "downgraded without --allow-downgrade?"
fi fi
assert_file_has_content err.txt "Upgrade.*is chronologically older" assert_file_has_content err.txt "Upgrade.*is chronologically older"

12
tests/libtest.sh
View File

@ -488,6 +488,11 @@ EOF
cd ${oldpwd} cd ${oldpwd}
} }
timestamp_of_commit()
{
date --date="$(ostree --repo=$1 show $2 | grep -Ee '^Date: ' | sed -e 's,^Date: *,,')" '+%s'
}
os_repository_new_commit () os_repository_new_commit ()
{ {
boot_checksum_iteration=${1:-0} boot_checksum_iteration=${1:-0}
@ -529,6 +534,13 @@ os_repository_new_commit ()
echo "content iteration ${content_iteration}" > usr/bin/content-iteration echo "content iteration ${content_iteration}" > usr/bin/content-iteration
${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" -b $branch -s "Build" ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" -b $branch -s "Build"
if ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo rev-parse ${branch} 2>/dev/null; then
prevdate=$(timestamp_of_commit ${test_tmpdir}/testos-repo "${branch}"^)
newdate=$(timestamp_of_commit ${test_tmpdir}/testos-repo "${branch}")
if [ $((${prevdate} > ${newdate})) = 1 ]; then
fatal "clock skew detected writing commits: prev=${prevdate} new=${newdate}"
fi
fi
cd ${test_tmpdir} cd ${test_tmpdir}
} }