Open Stack

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi all,

I've found out there are no clear public instructions on how to handle
oslo-incubator synchronizations in master and stable branches neither
at [1] nor at [2]. Though my observations show that there is some oral
tradition around community on how we handle those review, as follows:

1. For master oslo-incubator sync requests, we tend to sync the whole
modules or even all the modules that a project uses (unless some
specific obstacles to do so). This is to use the latest and greatest
code from Oslo subproject, fetch all possible bug fixes and goodies,
and make the synchronized copy of it as similar to upstream
(=oslo-incubator) as possible.

2. For stable branches, the process is a bit different. For those
branches, we don't generally want to introduce changes that are not
related to specific issues in a project. So in case of backports, we
tend to do per-patch consideration when synchronizing from incubator.

3. Backporting for stable branches is a bit complicated process. When
reviewing synchronization requests for those branches, we should not
only check that the code is present in all consequent branches of the
appropriate project (f.e. for Havana, in both Juno and Icehouse), but
also that the patches being synchronized were successfully backported
to corresponding stable branches of oslo-incubator. So the usual way
of oslo-incubator bug fix is (in case of e.g. Neutron):

oslo-incubator (master) -> neutron (master) -> oslo-incubator
(stable/icehouse) -> neutron (stable/icehouse).

[For Havana, it's even more complicated, introducing more elements in
the backporting chain.]

I hope I've described the existing oral tradition correctly. Please
comment on that, and if we're ok with the way it's written above, I'd
like to update our wiki pages ([1] and [2]) with that.

[1]:
https://wiki.openstack.org/wiki/ReviewChecklist#Oslo_Syncing_Checklist

[2]: https://wiki.openstack.org/wiki/StableBranch

Cheers,
/Ihar
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)

iQEcBAEBCgAGBQJT81aRAAoJEC5aWaUY1u57PmgIAIJzzOUHMRe4oDJ0slj5DwjW
FpXY6ce/awnFBpG7PR/qlMWXrbGHwesDZ3oihVHA4hbGOkjG7trK35uP07A9IQDI
fptLQZ0CXIjgQghoHUtM2BUUjJ19jwKaMdX14BNAAIO6C0hJMElpl/ZTY7zGwa9S
pBotxelpMHr4fE06BqDU5hfradBPJOjn0dg2xcqchYU67B8DqTYaLHwQh9XL1r8s
16IvcDlrpJf9N2f9G/V6SlgJlgZzVUfyeKIKQ47/AP+FsSv2rPpH6UgtDdIy8yqj
IMyyXUNbvBNwZTC4bLd6NlrNIuLBLmUX7Ao96wldFbAc84uFc6iAoRrtPNdj2ec=
=B7+E
-----END PGP SIGNATURE-----