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

libtest: allow committing to alternative branches

Browse Source 
This will be used by the upcoming test-admin-upgrade-endoflife.sh

Closes: #874
Approved by: cgwalters
This commit is contained in:
Daniel Drake authored and Atomic Bot committed 2017-05-22 20:18:07 +00:00
1 parent a2be46114a
commit cd65f85dcb
1 file changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files
tests/libtest.sh
+2 -1
View File
@@ -446,6 +446,7 @@ os_repository_new_commit ()
{ {
boot_checksum_iteration=${1:-0} boot_checksum_iteration=${1:-0}
content_iteration=${2:-0} content_iteration=${2:-0}
branch=${3:-testos/buildmaster/x86_64-runtime}
echo "BOOT ITERATION: $boot_checksum_iteration" echo "BOOT ITERATION: $boot_checksum_iteration"
cd ${test_tmpdir}/osdata cd ${test_tmpdir}/osdata
rm boot/* rm boot/*
@@ -464,7 +465,7 @@ os_repository_new_commit ()
version=$(date "+%Y%m%d.${content_iteration}") version=$(date "+%Y%m%d.${content_iteration}")
${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" -b testos/buildmaster/x86_64-runtime -s "Build" ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --add-metadata-string "version=${version}" -b $branch -s "Build"
cd ${test_tmpdir} cd ${test_tmpdir}
} }