| Message ID | 20211026182644.31853-1-aconole@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ci: make linux-prepare trust system installs. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
On 10/26/21 20:26, Aaron Conole wrote: > Recently, the github actions CI environment has been broken due to an > incompatibility between sphinx-build and the docutils python package. > The pip3 install command will upgrade docutils to an incompatible > version. > > Since we install sphinx via pip3, it will always install an appropriate > version of docutils package. By forcing the upgrade, we created a broken > situation. Remove the upgrade command and trust pip3. > > Signed-off-by: Aaron Conole <aconole@redhat.com> > Reported-by: Ilya Maximets <i.maximets@ovn.org> > --- Thanks! Applied to all active branches (down to 2.13). I also noticed that we're installing docutils on osx, but we're not installing sphinx there, so the command is kind of useless. I applied this patch as-is to unblock the CI, but we should, probably, clean up osx build too. Best regards, Ilya Maximets.
On 10/27/21 11:33, Ilya Maximets wrote: > On 10/26/21 20:26, Aaron Conole wrote: >> Recently, the github actions CI environment has been broken due to an >> incompatibility between sphinx-build and the docutils python package. >> The pip3 install command will upgrade docutils to an incompatible >> version. >> >> Since we install sphinx via pip3, it will always install an appropriate >> version of docutils package. By forcing the upgrade, we created a broken >> situation. Remove the upgrade command and trust pip3. >> >> Signed-off-by: Aaron Conole <aconole@redhat.com> >> Reported-by: Ilya Maximets <i.maximets@ovn.org> >> --- > > Thanks! Applied to all active branches (down to 2.13). > > I also noticed that we're installing docutils on osx, but we're not > installing sphinx there, so the command is kind of useless. > I applied this patch as-is to unblock the CI, but we should, probably, > clean up osx build too. > > Best regards, Ilya Maximets. > Apparently, OVN has the same issue, so this change should be applied there too. CC: Mark and Numan. If you need the patch to be sent separately for OVN, I guess, Aaron can do that, or I can. Please, let us know. Best regards, Ilya Maximets.
On Wed, Oct 27, 2021 at 11:06 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > On 10/27/21 11:33, Ilya Maximets wrote: > > On 10/26/21 20:26, Aaron Conole wrote: > >> Recently, the github actions CI environment has been broken due to an > >> incompatibility between sphinx-build and the docutils python package. > >> The pip3 install command will upgrade docutils to an incompatible > >> version. > >> > >> Since we install sphinx via pip3, it will always install an appropriate > >> version of docutils package. By forcing the upgrade, we created a broken > >> situation. Remove the upgrade command and trust pip3. > >> > >> Signed-off-by: Aaron Conole <aconole@redhat.com> > >> Reported-by: Ilya Maximets <i.maximets@ovn.org> > >> --- > > > > Thanks! Applied to all active branches (down to 2.13). > > > > I also noticed that we're installing docutils on osx, but we're not > > installing sphinx there, so the command is kind of useless. > > I applied this patch as-is to unblock the CI, but we should, probably, > > clean up osx build too. > > > > Best regards, Ilya Maximets. > > > > Apparently, OVN has the same issue, so this change should be applied > there too. > > CC: Mark and Numan. > > If you need the patch to be sent separately for OVN, I guess, Aaron can > do that, or I can. Please, let us know. Thanks Ilya and Aaron. I'll try to cherry-pick the commit directly from OVS. If it fails I'll let you know here. Thanks Numan > > Best regards, Ilya Maximets. > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Wed, Oct 27, 2021 at 11:52 AM Numan Siddique <numans@ovn.org> wrote: > > On Wed, Oct 27, 2021 at 11:06 AM Ilya Maximets <i.maximets@ovn.org> wrote: > > > > On 10/27/21 11:33, Ilya Maximets wrote: > > > On 10/26/21 20:26, Aaron Conole wrote: > > >> Recently, the github actions CI environment has been broken due to an > > >> incompatibility between sphinx-build and the docutils python package. > > >> The pip3 install command will upgrade docutils to an incompatible > > >> version. > > >> > > >> Since we install sphinx via pip3, it will always install an appropriate > > >> version of docutils package. By forcing the upgrade, we created a broken > > >> situation. Remove the upgrade command and trust pip3. > > >> > > >> Signed-off-by: Aaron Conole <aconole@redhat.com> > > >> Reported-by: Ilya Maximets <i.maximets@ovn.org> > > >> --- > > > > > > Thanks! Applied to all active branches (down to 2.13). > > > > > > I also noticed that we're installing docutils on osx, but we're not > > > installing sphinx there, so the command is kind of useless. > > > I applied this patch as-is to unblock the CI, but we should, probably, > > > clean up osx build too. > > > > > > Best regards, Ilya Maximets. > > > > > > > Apparently, OVN has the same issue, so this change should be applied > > there too. > > > > CC: Mark and Numan. > > > > If you need the patch to be sent separately for OVN, I guess, Aaron can > > do that, or I can. Please, let us know. > > Thanks Ilya and Aaron. > > I'll try to cherry-pick the commit directly from OVS. If it fails > I'll let you know here. > I was able to cherry-pick the commit from OVS to OVN without any issues. All the CI tests passed on my private repo. So I went ahead applied the commit to the main branch - https://github.com/ovn-org/ovn/commit/13770dba7910fec97c17e69f9155e0d75209c072 Thanks Numan > Thanks > Numan > > > > > Best regards, Ilya Maximets. > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >
diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh index c55125cf78..e4d2a187e0 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -22,7 +22,6 @@ cd .. pip3 install --disable-pip-version-check --user \ flake8 hacking sphinx pyOpenSSL wheel setuptools -pip3 install --user --upgrade docutils pip3 install --user 'meson==0.47.1' if [ "$M32" ]; then
Recently, the github actions CI environment has been broken due to an incompatibility between sphinx-build and the docutils python package. The pip3 install command will upgrade docutils to an incompatible version. Since we install sphinx via pip3, it will always install an appropriate version of docutils package. By forcing the upgrade, we created a broken situation. Remove the upgrade command and trust pip3. Signed-off-by: Aaron Conole <aconole@redhat.com> Reported-by: Ilya Maximets <i.maximets@ovn.org> --- .ci/linux-prepare.sh | 1 - 1 file changed, 1 deletion(-)