Hi Tim, Thank you for your response! From the statement, it does not seem to refer to a merged commit, which does not apply to our case. But you could be right.
Anyway we will upload a patch for the release request and put down the git hash of the last commit which should be included in this Mitaka release. The Neutron release team will review it and let us know if there is more we need to do. Thanks, Cathy -----Original Message----- From: Tim Rozet [mailto:tro...@redhat.com] Sent: Thursday, September 01, 2016 2:01 PM To: OpenStack Development Mailing List (not for usage questions) Cc: Ihar Hrachyshka; Armando M.; Cathy Zhang Subject: Re: [openstack-dev] [Neutron][networking-sfc] need help on requesting release for networking-sfc Hi Cathy, I haven't done this in openstack before, but what I believe the statement is referring to is that you need to make sure you tag a merged commit, if the topic branch had diverged from master and had to be merged into your master trunk. For example: commit f01595f801e1d78f84b43c111f2955f67573e263 Merge: 04a7bf2 4b84887 Author: Tim Rozet <tro...@redhat.com> Date: Wed Aug 31 01:40:12 2016 +0000 Merge "Adds ability to power off nodes in clean" commit 4b84887ed2322db6b04924bdee7b44d3dcf7c32d Author: Tim Rozet <tro...@redhat.com> Date: Tue Aug 30 13:06:33 2016 -0400 Adds ability to power off nodes in clean Now if an inventory file is provided to clean, those nodes will be powered off. JIRA: APEX-250 Change-Id: I2d78285717726c3d1c9d7d88c38e706d4617e337 Signed-off-by: Tim Rozet <tro...@redhat.com> In this situation I want to tag f01595f801e, because it is the merged commit (and not 4b84887). To create a tag you can do this: git checkout <sha of commit> git tag -am "<RELEASE TAG>" <RELEASE_TAG> git push origin <RELEASE_TAG> Hope that helps, Tim Rozet Red Hat SDN Team ----- Original Message ----- From: "Cathy Zhang" <cathy.h.zh...@huawei.com> To: "Ihar Hrachyshka" <ihrac...@redhat.com>, "Armando M." <arma...@gmail.com>, "Cathy Zhang" <cathy.h.zh...@huawei.com> Cc: "OpenStack Development Mailing List (not for usage questions)" <openstack-dev@lists.openstack.org> Sent: Thursday, September 1, 2016 3:03:13 PM Subject: Re: [openstack-dev] [Neutron][networking-sfc] need help on requesting release for networking-sfc Thanks for all your response. We would like to have the stable branch pulled from a git commit. Shall we use the git hash of that commit for the intended git hash in the release request? I am confused about the following statement in the release guide. "You need to be careful when picking a git commit to base new releases on. In most cases, you’ll want to tag the merge commit that merges your last commit in to the branch. This bug shows an instance where this mistake was caught. Notice the difference between the incorrect commit and the correct one which is the merge commit. git log 6191994..22dd683 --oneline shows that the first one misses a handful of important commits that the second one catches. This is the nature of merging to master." What is meant by " tag the merge commit"? How do we tag a git commit on our master branch? Thanks, Cathy -----Original Message----- From: Ihar Hrachyshka [mailto:ihrac...@redhat.com] Sent: Thursday, September 01, 2016 4:22 AM To: Armando M. Cc: Cathy Zhang; OpenStack Development Mailing List (not for usage questions) Subject: Re: [openstack-dev] [Neutron][networking-sfc] need help on requesting release for networking-sfc Armando M. <arma...@gmail.com> wrote: > > > On 31 August 2016 at 17:31, Cathy Zhang <cathy.h.zh...@huawei.com> wrote: > CC OpenStack alias. > > > > From: Cathy Zhang > Sent: Wednesday, August 31, 2016 5:19 PM > To: Armando Migliaccio; Ihar Hrachyshka; Cathy Zhang > Subject: need help on requesting release for networking-sfc > > > > Hi Armando/Ihar, > > > > I would like to submit a request for a networking-sfc release. I did > this for previous branch release by submitting a bug request in > launchpad before. I see that other subproject, such as L2GW, did this > in Launchpad for mitaka release too. > > But the Neutron stadium link > http://docs.openstack.org/developer/neutron/stadium/sub_project_guidel > ines.html#sub-project-release-process > states that “A sub-project owner proposes a patch to > openstack/releases repository with the intended git hash. The Neutron > release liaison should be added in Gerrit to the list of reviewers for the > patch”. > > > > Could you advise which way I should go or should I do both? > > > Consider the developer documentation the most up to date process, so > please go ahead with a patch against the openstack/releases repo. Right. There was a recent change to the process that streamlined release requests and hopefully made them a tad easier for both subproject owners as well as release liaison. Please stick to the latest version of the process as described in devref in master branch of neutron repo. Ihar __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
