<div dir="ltr"><div dir="ltr">I'm sorry, this is going to be a noisy thread for a while - but this is Complicated, and I want to make sure everyone stays on the same page as we get ourselves out of this thicket...</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, May 11, 2021 at 4:20 PM Grant Gainey <<a href="mailto:ggainey@redhat.com">ggainey@redhat.com</a>> wrote:</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div>Whew. So anyway, the sequence to unsnarl this goes something like so:</div><div><br></div><div>1. get pulp_rpm CI building against pulpcore-3.12</div><div> - <a href="https://github.com/pulp/pulp_rpm/pull/1985" target="_blank">PR#1985</a><br></div><div> - figure out how to pin django-2.2.20 before pip tries to install 2.2.21</div></div></div></blockquote><div><br></div><div>This step is *completed*. <a href="https://github.com/pulp/pulp_rpm/pull/1985">PR#1985</a> was modified and built successfully!</div><div><br></div><div>fao89 points out that the trick we're doing w/ requirements.txt won't work for release-jobs because they install pulpcore from pypi. </div><div><br></div><div>Suggestion: </div></div><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div class="gmail_quote"><div><font face="monospace" size="1"><fao891> an alternative would be pinning django on the container image - <a href="https://github.com/pulp/pulp_rpm/blob/master/.ci/ansible/Containerfile.j2#L13-L22">https://github.com/pulp/pulp_rpm/blob/master/.ci/ansible/Containerfile.j2#L13-L22</a></font></div></div><div class="gmail_quote"><div><font face="monospace" size="1"><bmbouter> fao891: yeah that's what we need right there</font></div></div></blockquote><div class="gmail_quote"><div><br></div><div>So that can be something to look at going forward.</div><div><br></div><div>Next up is "revert The Things", but I'm not going to do that at the end of a long day.</div><div><br></div><div>G</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><div>2. Revert the following commits in pulp_rpm:</div><div><div><font face="monospace"> - d0c9badd Refactor distribution migration 0032<br></font></div><div><font face="monospace"> - fbaadaca Add support for automatic publishing and distributing</font></div></div><div><font face="monospace"> - 3157ad Oracle ULN</font><br></div><div><font face="arial, sans-serif">3. get the static_context change updated (since a migration will have Left the Building) and get it merged</font></div><div><font face="arial, sans-serif">4. </font>merge any other fixes that won't break 3.7-compat [OPTIONAL], and THEN </div><div>5. cut pulp-rpm/3.11 as compatible with pulpcore/3.7-thru-3.10 </div><div><br></div><div>Once 3.11 is in the can, then we :</div><div>1. Re-apply the reverted PRs and resolve conflicts (there will be some)</div><div>2. remove the dependency on enqueue_with_reservation()</div><div>3. Unpin pulp_rpm from 3.12/django-2.2.20</div><div>4 Release a pulp_rpm/3.12 that will be ready for pulppcore/3.13 to be released</div><div><br></div><div>I feel like I've missed a step somewhere - dalley, bmbouter, was there something else form the call we just had? Or is this It?</div><div><br></div><div>Whew!</div><div><br></div><div>OK, I am off to adjust PR-1985 to do step-1 above.</div><div><br></div><div>G</div><div><br></div><div><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, May 11, 2021 at 11:49 AM Grant Gainey <<a href="mailto:ggainey@redhat.com" target="_blank">ggainey@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hey folks,<div><br></div><div>We've been talking about how we need a pulpcore/3.7-to-3.11-compatible release of pulp_rpm. The static_context change requires a schema-change, and it has to be available to katello-3.18 (and hence pulpcore-3.7)</div><div><br></div><div>The static_context change is <a href="https://github.com/pulp/pulp_rpm/pull/1984" target="_blank">PR#1984</a></div><div><br></div><div>Right now, pulp-rpm/master has changes that require pulpcore/3.12 or later. Those changes are:</div><div><br></div><div><font face="monospace">d0c9badd Refactor distribution migration 0032<br></font></div><div><font face="monospace">fbaadaca Add support for automatic publishing and distributing</font><br><div><br></div><div>In addition, pulp_rpm/master is <b>currently broken</b> because it still references the deprecated enqueue_with_reservation(), that just got removed from pulpcore/master.</div><div><br></div><div>As I understand it, what needs to happen #SOON, is the following:</div><div><ol><li>revert the two commits above and merge, </li><li>get the static_context change updated (since a migration will have Left the Building) and get it merged, </li><li>merge any other fixes that won't break 3.7-compat [OPTIONAL], and THEN </li><li>cut 3.11 as compatible with 3.7-thru-3.10 pulpcore</li></ol></div><div>Once pulp_rpm/3.11 is released, we can then:</div><div><ol><li>re-apply the auto-pub/dist-schema changes,</li><li>fix enqueue-problem, </li><li>mark pulp_rpm/master as 3.12+ compat, and finally</li><li>release pulp_rpm/3.12 to be ready for pulpcore-3.13</li></ol></div><div>And this all needs to happen by next week?</div><div><br></div><div>Is there anything I'm missing here?</div><div><br></div><div>G</div>-- <br><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><div>Grant Gainey</div><div>Principal Software Engineer, Red Hat System Management Engineering</div></div></div></div></div></div></div> </blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><div>Grant Gainey</div><div>Principal Software Engineer, Red Hat System Management Engineering</div></div></div></div></div></div></div></div> </blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Grant Gainey</div><div>Principal Software Engineer, Red Hat System Management Engineering</div></div></div></div></div></div>