<div dir="ltr"><div dir="ltr">On Mon, 17 May 2021 at 14:29, Marios Andreou <<a href="mailto:marios@redhat.com">marios@redhat.com</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Fri, May 14, 2021 at 11:41 PM Előd Illés <elod.illes@est.tech> wrote:<br>
><br>
> Hi teams in $SUBJECT,<br>
><br>
> during the deletion of $series-eol tagged branches it turned out that<br>
> the below listed branches / repositories contains merged patches on top<br>
> of $series-eol tag. The issue is with this that whenever the branch is<br>
> deleted only the $series-eol (and other) tags can be checked out, so the<br>
> changes that were merged after the eol tags, will be *lost*.<br>
><br>
> There are two options now:<br>
><br>
> 1. Create another tag (something like: "$series-eol-extra"), so that the<br>
> extra patches will not be lost completely, because they can be checked<br>
> out with the newly created tags<br>
><br>
> 2. Delete the branch anyway and don't care about the lost patch(es)<br>
><br>
> Here are the list of such branches, please consider which option is good<br>
> for the team and reply to this mail:<br>
><br>
<br>
Hello Elod<br>
<br>
thank you for all your work on this and apologies for the commits<br>
after the eol tag<br>
<br>
Personally I vote for the easiest path which I believe is option 2<br>
here just discard those commits and remove the branch. I think 2 of<br>
the three flagged here are mine (:/ sorry I should know better ;)) so<br>
ack from me but adding owalsh/dbengt into the cc as the other commit<br>
is his.<br>
<br>
Some more comments/pointers inline thanks:<br>
<br>
> openstack/octavia<br>
> * stable/stein has patches on top of the stein-eol tag<br>
> * stable/queens has patches on top of the queens-eol tag<br>
><br>
> openstack/kolla<br>
> * stable/pike has patches on top of the pike-eol tag<br>
> * stable/ocata has patches on top of the ocata-eol tag<br>
><br>
> openstack/tripleo-common<br>
> * stable/rocky has patches on top of the rocky-eol tag<br>
><br>
<br>
for tripleo-common this is the patch in question:<br>
<br>
* <a href="https://github.com/openstack/tripleo-common/compare/rocky-eol...stable/rocky" rel="noreferrer" target="_blank">https://github.com/openstack/tripleo-common/compare/rocky-eol...stable/rocky</a><br>
* <a href="https://github.com/openstack/tripleo-common/commit/77a0c827cbb02c3374d72f48973ba24d6c34d50c" rel="noreferrer" target="_blank">https://github.com/openstack/tripleo-common/commit/77a0c827cbb02c3374d72f48973ba24d6c34d50c</a><br>
* Ensure tripleo ansible inventory file update is atomic<br>
<a href="https://review.opendev.org/q/Ifa41bfcb921496978f82aee4e67fdb419cf9ffc5" rel="noreferrer" target="_blank">https://review.opendev.org/q/Ifa41bfcb921496978f82aee4e67fdb419cf9ffc5</a><br>
(cherry picked from commit 8e082f4 * (cherry picked from commit<br>
c1af9b7) * (squashing commits as the 1st patch is failing in the stein<br>
gate without<br>
the fix from the 2nd patch)<br>
* <a href="https://review.opendev.org/c/openstack/tripleo-common/+/765502" rel="noreferrer" target="_blank">https://review.opendev.org/c/openstack/tripleo-common/+/765502</a><br>
<br>
so cc'ing owalsh to allow him to raise an objection will also reach<br>
out on irc after I send this and point to it ;)<br></blockquote><div><br></div><div>No objection from me. Also confirmed on IRC with Daniel as he proposed the stable/rocky backport.<br></div><div><br></div><div>Thanks,</div><div>Ollie</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> openstack/os-apply-config<br>
> * stable/pike has patches on top of the pike-eol tag<br>
<br>
* <a href="https://github.com/openstack/os-apply-config/compare/pike-eol...stable/pike" rel="noreferrer" target="_blank">https://github.com/openstack/os-apply-config/compare/pike-eol...stable/pike</a><br>
* <a href="https://github.com/openstack/os-apply-config/commit/1fcccb880e30522d66238b205a48d553a050c562" rel="noreferrer" target="_blank">https://github.com/openstack/os-apply-config/commit/1fcccb880e30522d66238b205a48d553a050c562</a><br>
* Remove tripleo-multinode-container|baremetal-minimal from layout<br>
* Change-Id: I6715edd673b45dad6fba7d1987eac8677f61eaa2<br>
* 2 zuul.d/layout.yaml<br>
*<br>
<a href="https://review.opendev.org/c/openstack/os-apply-config/+/777527" rel="noreferrer" target="_blank">https://review.opendev.org/c/openstack/os-apply-config/+/777527</a><br>
<br>
> * stable/ocata has patches on top of the ocata-eol tag<br>
><br>
<br>
* <a href="https://github.com/openstack/os-apply-config/compare/ocata-eol...stable/ocata" rel="noreferrer" target="_blank">https://github.com/openstack/os-apply-config/compare/ocata-eol...stable/ocata</a><br>
* <a href="https://github.com/openstack/os-apply-config/commit/31768f04a30023a0d54099c1aeb80134ffe5dd64" rel="noreferrer" target="_blank">https://github.com/openstack/os-apply-config/commit/31768f04a30023a0d54099c1aeb80134ffe5dd64</a><br>
* Remove tripleo-multinode-container|baremetal-minimal from layout<br>
* Change-Id: Iefe3eed322f1102344c6b54531c61a41ce4d227b<br>
* 9 zuul.d/layout.yaml<br>
*<br>
<a href="https://review.opendev.org/c/openstack/os-apply-config/+/777533" rel="noreferrer" target="_blank">https://review.opendev.org/c/openstack/os-apply-config/+/777533</a><br>
<br>
<br>
both of those are mine so ack from me on nuking them<br>
<br>
thanks to you and all the release team for checking and for your work<br>
on this and all the release things<br>
<br>
regards, marios<br>
<br>
<br>
<br>
<br>
> openstack/os-cloud-config<br>
> stable/ocata has patches on top of the ocata-eol tag<br>
><br>
> Thanks,<br>
><br>
> Előd<br>
><br>
><br>
><br>
<br>
</blockquote></div></div>