[Starlingx-discuss] CentOS 7.6 feature branch ready to merge to master

[Lin, Shuicheng]

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 at intel.com] 
Sent: Tuesday, March 12, 2019 8:31 PM
To: Dean Troyer <dtroyer at gmail.com>; Saul Wold <sgw at linux.intel.com>
Cc: starlingx <starlingx-discuss at 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 at gmail.com] 
Sent: Monday, March 11, 2019 11:19 PM
To: Saul Wold <sgw at linux.intel.com>
Cc: starlingx <starlingx-discuss at 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 at 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 at gmail.com

_______________________________________________
Starlingx-discuss mailing list
Starlingx-discuss at lists.starlingx.io
http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss
_______________________________________________
Starlingx-discuss mailing list
Starlingx-discuss at lists.starlingx.io
http://lists.starlingx.io/cgi-bin/mailman/listinfo/starlingx-discuss