Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix the issues with github issues backporting to release branch #101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix the issues with github issues backporting to release branch #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions compare-bug-version-and-git-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ BUG=$(git show --name-only --format=email | awk '{IGNORECASE=1} /^BUG:/{print $2
if [ -z "${BUG}" -a "${GERRIT_TOPIC}" = "rfc" ]; then
echo "No BUG id for rfc needed."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we instead add a check here? Patches with rfc should have an issue?

@ShyamsundarR Thoughts?

exit 0
elif [ -a "${GERRIT_TOPIC#*rfc*}" != "${GERRIT_TOPIC}" -a "${GERRIT_BRANCH}" != "master" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what we're testing here, because this would be caught above.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack to @nigelbabu's comment.

The intention (as I understand) is to be able to port features to branches without a BUG ID, which is (sort of) disallowed. The exception being between branch creation and first build (typically 2 weeks from branch creation), for noted feature exceptions.

For such noted exceptions, it is better to have a bug created for the backport, as that aids tracking what gets into the release from the point of branching (of course this is when referring to bug tracking alone, and can be achieved when using issue tracking as well, so small proce to pay).

@amarts can you clarify?

echo "No BUG id for rfc needed in 'non-master' branch"
exit 0
elif [ -z "${BUG}" ]; then
echo "No BUG id, but topic '${GERRIT_TOPIC}' does not match 'rfc'."
exit 1
Expand Down