diff options
| author | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:42:37 +0200 |
|---|---|---|
| committer | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:55:03 +0200 |
| commit | 02527f115e934d40a37a4b2b41f1a93eaf70732b (patch) | |
| tree | b08b769dbb945d65eb0faebbbf07cc836f7a01d6 /tests/libtest.sh | |
| parent | b8cca6cef14716987bbf7ef8f6edcbfc1688cc4c (diff) | |
| download | ostree-02527f115e934d40a37a4b2b41f1a93eaf70732b.tar.gz | |
*: rename master to main in tests & examples
Diffstat (limited to 'tests/libtest.sh')
| -rwxr-xr-x | tests/libtest.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/libtest.sh b/tests/libtest.sh index 40f362be..bf34cd5e 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -455,12 +455,12 @@ EOF mkdir -p usr/etc/testdirectory echo "a default daemon file" > usr/etc/testdirectory/test - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-runtime -s "Build" + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmain/x86_64-runtime -s "Build" # Ensure these commits have distinct second timestamps sleep 2 echo "a new executable" > usr/bin/sh - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.10 -b testos/buildmaster/x86_64-runtime -s "Build" + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.10 -b testos/buildmain/x86_64-runtime -s "Build" cd ${test_tmpdir} rm -rf osdata-devel @@ -469,7 +469,7 @@ EOF cd osdata-devel mkdir -p usr/include echo "a development header" > usr/include/foo.h - ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmaster/x86_64-devel -s "Build" + ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit ${bootable_flag} --add-metadata-string version=1.0.9 -b testos/buildmain/x86_64-devel -s "Build" ${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo fsck -q @@ -516,7 +516,7 @@ os_repository_new_commit () { boot_checksum_iteration=${1:-0} content_iteration=${2:-0} - branch=${3:-testos/buildmaster/x86_64-runtime} + branch=${3:-testos/buildmain/x86_64-runtime} export version=${4:-$(date "+%Y%m%d.${content_iteration}")} echo "BOOT ITERATION: $boot_checksum_iteration" cd ${test_tmpdir}/osdata |