-
Notifications
You must be signed in to change notification settings - Fork 290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow commits to mark refs as EOL, replaced by others #874
Closed
Closed
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
258f8ac
libtest: allow committing to alternative branches
dsd e3b9123
Allow commits to mark refs as EOL, replaced by others
dsd 15f469f
fixup! Allow commits to mark refs as EOL, replaced by others
dsd b114b06
fixup! Allow commits to mark refs as EOL, replaced by others
dsd 52858b5
fixup! Allow commits to mark refs as EOL, replaced by others
dsd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
#!/bin/bash | ||
# | ||
# Copyright (C) 2014 Colin Walters <walters@verbum.org> | ||
# | ||
# This library is free software; you can redistribute it and/or | ||
# modify it under the terms of the GNU Lesser General Public | ||
# License as published by the Free Software Foundation; either | ||
# version 2 of the License, or (at your option) any later version. | ||
# | ||
# This library is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
# Lesser General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU Lesser General Public | ||
# License along with this library; if not, write to the | ||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
# Boston, MA 02111-1307, USA. | ||
|
||
set -euo pipefail | ||
|
||
. $(dirname $0)/libtest.sh | ||
|
||
# Exports OSTREE_SYSROOT so --sysroot not needed. | ||
setup_os_repository "archive-z2" "syslinux" | ||
# This does: | ||
# - init ostree repo in testos-repo | ||
# - create system files in osdata and commit twice those contents into testos-repo | ||
# - copy osdata to osdata-devel and make another change then commit | ||
# - create sysroot with init-fs and os-init and syslinux | ||
# sysroot has /ostree basics (but no contents), syslinux cfg and empty root dirs | ||
|
||
echo "1..3" | ||
|
||
cd ${test_tmpdir} | ||
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos $(cat httpd-address)/ostree/testos-repo | ||
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull testos testos/buildmaster/x86_64-runtime | ||
rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) | ||
echo "rev=${rev}" | ||
|
||
# Now sysroot/ostree has the objects from the testos-repo (obtained over http | ||
# and kept in remote "testos"), but there is no deployment | ||
|
||
# This initial deployment gets kicked off with some kernel arguments | ||
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime | ||
assert_has_dir sysroot/boot/ostree/testos-${bootcsum} | ||
|
||
echo "ok deploy" | ||
|
||
# Create a new branch which we want to migrate to | ||
os_repository_new_commit 1 1 testos/buildmaster/newbranch | ||
# bootcsum now refers to this new commit | ||
|
||
# Create a new commit with an empty tree, which marks the original branch as | ||
# EOL, redirecting to the new one. | ||
mkdir empty | ||
${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo commit --tree=dir=$(pwd)/empty --add-metadata-string "ostree.endoflife=Product discontinued" --add-metadata-string "ostree.endoflife-rebase=testos/buildmaster/newbranch" -b testos/buildmaster/x86_64-runtime -s "EOL redirect to new branch" | ||
|
||
echo "ok new branch" | ||
|
||
# Upgrade existing checkout | ||
${CMD_PREFIX} ostree admin upgrade --os=testos --pull-only | ||
${CMD_PREFIX} ostree admin upgrade --os=testos --deploy-only | ||
|
||
# Check we got redirected to the new branch | ||
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "${bootcsum}" | ||
rev=$(${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo rev-parse testos/buildmaster/newbranch) | ||
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.0/usr/bin/content-iteration "1" | ||
|
||
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.0.origin "newbranch" | ||
|
||
echo "ok update and redirect" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have to account for local branches here too, right?
E.g. something like
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or possibly just do the whole block under
if (rebase && self->origin_remote)
? I can't think of a use case for local refs being redirected. But there's also an argument that we should be symmetric in our handling of local/remote refs - your change is definitely right from that perspective.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The symmetry argument definitely appeals to me, yeah. Even if only for making it easier to play with and test locally.