-
Notifications
You must be signed in to change notification settings - Fork 20
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
Fixes #11059: Create a rudder server upgrade-techniques commands #125
Fixes #11059: Create a rudder server upgrade-techniques commands #125
Conversation
while getopts "otc:" opt; do | ||
case $opt in | ||
o) | ||
OVERRIDE=true |
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.
Don't you want to set OVERRIDE and TAG to false as default ? (would put them few lines above above with DISPLAY_COMMAND)
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.
It is not necessary since they are compared to true, but it would make this more readable
commit=$(git log --oneline | grep "^[0-9a-f]* ${TAG_MESSAGE}" | head -n1) | ||
if [ "${commit}" = "" ] | ||
then | ||
echo "Upgrade without override not supported without tag message!" |
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.
WHy is that impossible ?
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.
WHy not starting from HEAD ?
Why not creating the branch from the commit and not HEAD ?
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.
ping @peckpeck ?
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.
Without a tag message we don't know where to start from. There is not commit id to start from.
If someone has touched the techniques the content will be overridden, that's why the user must be aware of this and use the override option.
@peckpeck ?? |
Commit modified |
487b71c
to
6bd6e31
Compare
git commit -q -m "New technique version from package" | ||
# merge the branch into master | ||
git checkout master | ||
git merge --commit -m "${TAG_MESSAGE} Technique upgrade via merge on $(date)" "upgrade/${COMMIT_ID}" |
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.
There should probably an explicit strategy here, -s theirs or something like that
6bd6e31
to
2766e4c
Compare
Commit modified |
This PR is not mergeable to upper versions. |
OK, merging this PR |
https://www.rudder-project.org/redmine/issues/11059
Replacing previous PR: #124