[Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
Hi build team, particularly reviewers,
I'm starting to see some code reviews come through which have to do with the rebase to CentOS 7.6. When these come through, please ensure they are against the feature branch and not the "master" branch. I do not see the feature branch yet created, but I'm assuming it will be called "f/centos76". There is an AR to creates the branch pending (meeting minutes "Notes: Weekly StarlingX non-OpenStack Distro meeting, 12/5").
-Jason
On Mon, Dec 10, 2018 at 7:28 AM McKenna, Jason Jason.McKenna@windriver.com wrote:
I’m starting to see some code reviews come through which have to do with the rebase to CentOS 7.6. When these come through, please ensure they are against the feature branch and not the “master” branch. I do not see the feature branch yet created, but I’m assuming it will be called “f/centos76”. There is an AR to creates the branch pending (meeting minutes “Notes: Weekly StarlingX non-OpenStack Distro meeting, 12/5”).
The f/centos76 branch has been created in stx-integ stx-root stx-tools stx-upstream.
dt
Thanks Dean for help create the feature branch.
Hi Jason, All CentOS 7.6 related code will be submitted to feature branch.
Best Regards Shuicheng
-----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Tuesday, December 11, 2018 3:02 AM To: McKenna, Jason Jason.McKenna@windriver.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
On Mon, Dec 10, 2018 at 7:28 AM McKenna, Jason Jason.McKenna@windriver.com wrote:
I’m starting to see some code reviews come through which have to do with the rebase to CentOS 7.6. When these come through, please ensure they are against the feature branch and not the “master” branch. I do not see the feature branch yet created, but I’m assuming it will be called “f/centos76”. There is an AR to creates the branch pending (meeting minutes “Notes: Weekly StarlingX non-OpenStack Distro meeting, 12/5”).
The f/centos76 branch has been created in stx-integ stx-root stx-tools stx-upstream.
dt
Hi Dean, Centos76 branch is failed to build due to qemu patch in master is not merged to feature branch. I try to use "git rebase master" to do the rebase. But it seems I don't have the grant for it. Could you help rebase stx-integ master change to branch? Thanks.
" To ssh://slin14@review.openstack.org:29418/openstack/stx-integ.git ! [remote rejected] HEAD -> refs/publish/f/centos76/centos76 (you are not allowed to upload merges) "
Best Regards Shuicheng
-----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Tuesday, December 11, 2018 3:02 AM To: McKenna, Jason Jason.McKenna@windriver.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
On Mon, Dec 10, 2018 at 7:28 AM McKenna, Jason Jason.McKenna@windriver.com wrote:
I’m starting to see some code reviews come through which have to do with the rebase to CentOS 7.6. When these come through, please ensure they are against the feature branch and not the “master” branch. I do not see the feature branch yet created, but I’m assuming it will be called “f/centos76”. There is an AR to creates the branch pending (meeting minutes “Notes: Weekly StarlingX non-OpenStack Distro meeting, 12/5”).
The f/centos76 branch has been created in stx-integ stx-root stx-tools stx-upstream.
dt
+ Saul who has the right to do so as well.
-----Original Message----- From: Lin, Shuicheng [mailto:shuicheng.lin@intel.com] Sent: Thursday, December 13, 2018 1:00 PM To: Dean Troyer dtroyer@gmail.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
Hi Dean, Centos76 branch is failed to build due to qemu patch in master is not merged to feature branch. I try to use "git rebase master" to do the rebase. But it seems I don't have the grant for it. Could you help rebase stx-integ master change to branch? Thanks.
" To ssh://slin14@review.openstack.org:29418/openstack/stx-integ.git ! [remote rejected] HEAD -> refs/publish/f/centos76/centos76 (you are not allowed to upload merges) "
Best Regards Shuicheng
-----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Tuesday, December 11, 2018 3:02 AM To: McKenna, Jason Jason.McKenna@windriver.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
On Mon, Dec 10, 2018 at 7:28 AM McKenna, Jason Jason.McKenna@windriver.com wrote:
I’m starting to see some code reviews come through which have to do with the rebase to CentOS 7.6. When these come through, please ensure they are against the feature branch and not the “master” branch. I do not see the feature branch yet created, but I’m assuming it will be called “f/centos76”. There is an AR to creates the branch pending (meeting minutes “Notes: Weekly StarlingX non-OpenStack Distro meeting, 12/5”).
The f/centos76 branch has been created in stx-integ stx-root stx-tools stx-upstream.
dt
On Wed, Dec 12, 2018 at 11:00 PM Lin, Shuicheng shuicheng.lin@intel.com wrote:
Centos76 branch is failed to build due to qemu patch in master is not merged to feature branch. I try to use "git rebase master" to do the rebase. But it seems I don't have the grant for it.
This is limited to the starlingx-release group in Gerrit.
Could you help rebase stx-integ master change to branch?
Done. https://review.openstack.org/#/c/625068/
dt
Hi Dean/Saul, Could you help rebase stx-tools master change to branch also? Otherwise, build iso will be failed in branch. Thanks.
Best Regards Shuicheng
-----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Friday, December 14, 2018 1:37 AM To: Lin, Shuicheng shuicheng.lin@intel.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
On Wed, Dec 12, 2018 at 11:00 PM Lin, Shuicheng shuicheng.lin@intel.com wrote:
Centos76 branch is failed to build due to qemu patch in master is not merged to feature branch. I try to use "git rebase master" to do the rebase. But it seems I don't have the grant for it.
This is limited to the starlingx-release group in Gerrit.
Could you help rebase stx-integ master change to branch?
Done. https://review.openstack.org/#/c/625068/
dt
On 12/13/18 4:42 PM, Lin, Shuicheng wrote:
Hi Dean/Saul, Could you help rebase stx-tools master change to branch also? Otherwise, build iso will be failed in branch. Thanks.
Done Review here: https://review.openstack.org/#/c/625137/
Sau!
Best Regards Shuicheng
-----Original Message----- From: Dean Troyer [mailto:dtroyer@gmail.com] Sent: Friday, December 14, 2018 1:37 AM To: Lin, Shuicheng shuicheng.lin@intel.com Cc: starlingx-discuss@lists.starlingx.io Subject: Re: [Starlingx-discuss] [build] CentOS 7.6 rebase into feature branch
On Wed, Dec 12, 2018 at 11:00 PM Lin, Shuicheng shuicheng.lin@intel.com wrote:
Centos76 branch is failed to build due to qemu patch in master is not merged to feature branch. I try to use "git rebase master" to do the rebase. But it seems I don't have the grant for it.
This is limited to the starlingx-release group in Gerrit.
Could you help rebase stx-integ master change to branch?
Done. https://review.openstack.org/#/c/625068/
dt
participants (5)
-
Dean Troyer
-
Lin, Shuicheng
-
McKenna, Jason
-
Saul Wold
-
Xie, Cindy