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.

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

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

Conversation

amarts
Copy link
Member

@amarts amarts commented Nov 2, 2017

Not sure if this fixes the master branch rfc branch issue..

@nigelbabu @ShyamsundarR

Copy link
Member Author

@amarts amarts left a comment

Choose a reason for hiding this comment

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

Not sure if this solves the master branch issue.. as the patch checks for non master branch. Is there a flag for knowing there is github ID?

@@ -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?

@@ -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."
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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants