[Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master
Folks, I pushed 5 reviews [0] to gerrit for merging to master, these have been tested by Shuicheng and are ready for the next level of testing as part of master. Sau! [0] https://review.openstack.org/#/q/topic:merge-f/centos-76+(status:open+OR+sta...)
Hi Saul, I checked the patches, but the content in gitweb seem like they are from master to centos76 feature branch. Need your double confirm on it. Thanks. Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change. Best Regards Shuicheng -----Original Message----- From: Saul Wold [mailto:sgw@linux.intel.com] Sent: Monday, March 11, 2019 3:01 PM To: starlingx-discuss@lists.starlingx.io Cc: Lin, Shuicheng <shuicheng.lin@intel.com> Subject: CentOS 7.6 feature branch ready to merge to master Folks, I pushed 5 reviews [0] to gerrit for merging to master, these have been tested by Shuicheng and are ready for the next level of testing as part of master. Sau! [0] https://review.openstack.org/#/q/topic:merge-f/centos-76+(status:open+OR+sta...)
On 3/11/19 1:10 AM, Lin, Shuicheng wrote:
Hi Saul, I checked the patches, but the content in gitweb seem like they are from master to centos76 feature branch. Need your double confirm on it. Thanks.
I guess I goofed this up, I will abandon this patch set and check with Dean on what the correct recipe/command set is for merging back into master.
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean. Sau!
Best Regards Shuicheng
-----Original Message----- From: Saul Wold [mailto:sgw@linux.intel.com] Sent: Monday, March 11, 2019 3:01 PM To: starlingx-discuss@lists.starlingx.io Cc: Lin, Shuicheng <shuicheng.lin@intel.com> Subject: CentOS 7.6 feature branch ready to merge to master
Folks,
I pushed 5 reviews [0] to gerrit for merging to master, these have been tested by Shuicheng and are ready for the next level of testing as part of master.
Sau!
[0] https://review.openstack.org/#/q/topic:merge-f/centos-76+(status:open+OR+sta...) _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
On 2019-03-11 01:28:43 -0700 (-0700), Saul Wold wrote:
On 3/11/19 1:10 AM, Lin, Shuicheng wrote: [...]
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean. [...]
Some guidance for this can be found in a subsection of the Feature Branches recommendations in the Infra Manual: https://docs.openstack.org/infra/manual/drivers.html#how-to-avoid-merging-sp... -- Jeremy Stanley
On Mon, Mar 11, 2019 at 3:28 AM Saul Wold <sgw@linux.intel.com> wrote:
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean.
I think the .gitreview is the only real problem you had? I do the merge back to master following https://wiki.openstack.org/wiki/StarlingX/Branches#Feature_Branches and swapping the 'master' and '$feature_branch' in the arguments. It results in the same thing, just depends on which branch you are in at the time of the merge. Just below that is the command to fix up .gitreview (whick we skip when going master -> $feature_branch). I've re-done stx-integ[0], stx-root[1], stx-tools[2] and stx-upstream[3]. stx-manifest does not appear to have any changes to master required (the only new bits in the feature branch are the revision="" attributes that master doesn't want). [0] https://review.openstack.org/642481 [1] https://review.openstack.org/642487 [2] https://review.openstack.org/642485 [3] https://review.openstack.org/642486 dt -- Dean Troyer dtroyer@gmail.com
Dean, Thanks for handling this, I will review these docs today. Can someone from the stx-upstream core team provide a +W to this review [0], it has 2 +2s but needs the +W Thanks Sau! [0] https://review.openstack.org/#/c/642486/ On 3/11/19 8:18 AM, Dean Troyer wrote:
On Mon, Mar 11, 2019 at 3:28 AM Saul Wold <sgw@linux.intel.com> wrote:
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean.
I think the .gitreview is the only real problem you had? I do the merge back to master following https://wiki.openstack.org/wiki/StarlingX/Branches#Feature_Branches and swapping the 'master' and '$feature_branch' in the arguments. It results in the same thing, just depends on which branch you are in at the time of the merge.
Just below that is the command to fix up .gitreview (whick we skip when going master -> $feature_branch).
I've re-done stx-integ[0], stx-root[1], stx-tools[2] and stx-upstream[3]. stx-manifest does not appear to have any changes to master required (the only new bits in the feature branch are the revision="" attributes that master doesn't want).
[0] https://review.openstack.org/642481 [1] https://review.openstack.org/642487 [2] https://review.openstack.org/642485 [3] https://review.openstack.org/642486
dt
Dean/Shuicheng, I noticed that all 4 patches below are now fully merged to Master - that's all for CentOS7.6, correct? Can we declare that we now have full CentOS7.6 support in StarlingX Master now? we may want to monitor the build and test results for today and see if there is any unexpected issues identified. Thx. - cindy -----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Monday, March 11, 2019 11:19 PM To: Saul Wold <sgw@linux.intel.com> Cc: starlingx <starlingx-discuss@lists.starlingx.io> Subject: Re: [Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master On Mon, Mar 11, 2019 at 3:28 AM Saul Wold <sgw@linux.intel.com> wrote:
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean.
I think the .gitreview is the only real problem you had? I do the merge back to master following https://wiki.openstack.org/wiki/StarlingX/Branches#Feature_Branches and swapping the 'master' and '$feature_branch' in the arguments. It results in the same thing, just depends on which branch you are in at the time of the merge. Just below that is the command to fix up .gitreview (whick we skip when going master -> $feature_branch). I've re-done stx-integ[0], stx-root[1], stx-tools[2] and stx-upstream[3]. stx-manifest does not appear to have any changes to master required (the only new bits in the feature branch are the revision="" attributes that master doesn't want). [0] https://review.openstack.org/642481 [1] https://review.openstack.org/642487 [2] https://review.openstack.org/642485 [3] https://review.openstack.org/642486 dt -- Dean Troyer dtroyer@gmail.com _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
Hi Cindy, Yes, we already have all change in centos76 feature branch merged back to Master. Best Regards Shuicheng -----Original Message----- From: Xie, Cindy [mailto:cindy.xie@intel.com] Sent: Tuesday, March 12, 2019 8:31 PM To: Dean Troyer <dtroyer@gmail.com>; Saul Wold <sgw@linux.intel.com> Cc: starlingx <starlingx-discuss@lists.starlingx.io> Subject: Re: [Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master Dean/Shuicheng, I noticed that all 4 patches below are now fully merged to Master - that's all for CentOS7.6, correct? Can we declare that we now have full CentOS7.6 support in StarlingX Master now? we may want to monitor the build and test results for today and see if there is any unexpected issues identified. Thx. - cindy -----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Monday, March 11, 2019 11:19 PM To: Saul Wold <sgw@linux.intel.com> Cc: starlingx <starlingx-discuss@lists.starlingx.io> Subject: Re: [Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master On Mon, Mar 11, 2019 at 3:28 AM Saul Wold <sgw@linux.intel.com> wrote:
Another thing we need take care is, the change in .gitreview file should not be merged to master, since it is branch specific change.
I am sure this will get taken care of correctly also once I check with Dean.
I think the .gitreview is the only real problem you had? I do the merge back to master following https://wiki.openstack.org/wiki/StarlingX/Branches#Feature_Branches and swapping the 'master' and '$feature_branch' in the arguments. It results in the same thing, just depends on which branch you are in at the time of the merge. Just below that is the command to fix up .gitreview (whick we skip when going master -> $feature_branch). I've re-done stx-integ[0], stx-root[1], stx-tools[2] and stx-upstream[3]. stx-manifest does not appear to have any changes to master required (the only new bits in the feature branch are the revision="" attributes that master doesn't want). [0] https://review.openstack.org/642481 [1] https://review.openstack.org/642487 [2] https://review.openstack.org/642485 [3] https://review.openstack.org/642486 dt -- Dean Troyer dtroyer@gmail.com _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss _______________________________________________ Starlingx-discuss mailing list Starlingx-discuss@lists.starlingx.io http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
participants (5)
-
Dean Troyer
-
Jeremy Stanley
-
Lin, Shuicheng
-
Saul Wold
-
Xie, Cindy