| Message ID | 20240514083851.417951-6-amusil@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Bump of CI Ubuntu and Fedora versions | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On 5/14/24 10:38, Ales Musil wrote: > There were two things missing for the Fedora builds, 32-bit > version of glibc to allows the -m32 compilation on Fedora > and numactl-devel package. > > Signed-off-by: Ales Musil <amusil@redhat.com> > --- > .ci/linux-build.sh | 3 +++ > utilities/containers/fedora/Dockerfile | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh > index 78f17f8bd..12966f532 100755 > --- a/.ci/linux-build.sh > +++ b/.ci/linux-build.sh > @@ -83,6 +83,9 @@ function configure_gcc() > # do it directly because gcc-multilib is not available > # for arm64 > sudo apt update && sudo apt install -y gcc-multilib > + elif which dnf; then > + # Install equivalent of gcc-multilib for Fedora. > + sudo dnf -y update && sudo dnf -y install glibc-devel.i686 dnf always refreshes package cache. 'dnf update' will actually update all the packages to the latest versions. I'm not sure it is an intended behavior here. > fi > fi > } > diff --git a/utilities/containers/fedora/Dockerfile b/utilities/containers/fedora/Dockerfile > index 9b8386aae..d40a7b31f 100755 > --- a/utilities/containers/fedora/Dockerfile > +++ b/utilities/containers/fedora/Dockerfile > @@ -28,6 +28,7 @@ RUN dnf -y update \ > libtool \ > net-tools \ > nmap-ncat \ > + numactl-devel \ > openssl \ > openssl-devel \ > procps-ng \
On Tue, May 14, 2024 at 3:19 PM Ilya Maximets <i.maximets@ovn.org> wrote: > On 5/14/24 10:38, Ales Musil wrote: > > There were two things missing for the Fedora builds, 32-bit > > version of glibc to allows the -m32 compilation on Fedora > > and numactl-devel package. > > > > Signed-off-by: Ales Musil <amusil@redhat.com> > > --- > > .ci/linux-build.sh | 3 +++ > > utilities/containers/fedora/Dockerfile | 1 + > > 2 files changed, 4 insertions(+) > > > > diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh > > index 78f17f8bd..12966f532 100755 > > --- a/.ci/linux-build.sh > > +++ b/.ci/linux-build.sh > > @@ -83,6 +83,9 @@ function configure_gcc() > > # do it directly because gcc-multilib is not available > > # for arm64 > > sudo apt update && sudo apt install -y gcc-multilib > > + elif which dnf; then > > + # Install equivalent of gcc-multilib for Fedora. > > + sudo dnf -y update && sudo dnf -y install glibc-devel.i686 > > dnf always refreshes package cache. 'dnf update' will actually update > all the packages to the latest versions. I'm not sure it is an intended > behavior here. > Yeah good point, we shouldn't update the packages just install the missing one. So only the install part is needed, I'll wait for other reviews before posting v2. > > > fi > > fi > > } > > diff --git a/utilities/containers/fedora/Dockerfile > b/utilities/containers/fedora/Dockerfile > > index 9b8386aae..d40a7b31f 100755 > > --- a/utilities/containers/fedora/Dockerfile > > +++ b/utilities/containers/fedora/Dockerfile > > @@ -28,6 +28,7 @@ RUN dnf -y update \ > > libtool \ > > net-tools \ > > nmap-ncat \ > > + numactl-devel \ > > openssl \ > > openssl-devel \ > > procps-ng \ > > Thanks, Ales
On Tue, May 14, 2024 at 9:46 AM Ales Musil <amusil@redhat.com> wrote: > > On Tue, May 14, 2024 at 3:19 PM Ilya Maximets <i.maximets@ovn.org> wrote: > > > On 5/14/24 10:38, Ales Musil wrote: > > > There were two things missing for the Fedora builds, 32-bit > > > version of glibc to allows the -m32 compilation on Fedora > > > and numactl-devel package. > > > > > > Signed-off-by: Ales Musil <amusil@redhat.com> > > > --- > > > .ci/linux-build.sh | 3 +++ > > > utilities/containers/fedora/Dockerfile | 1 + > > > 2 files changed, 4 insertions(+) > > > > > > diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh > > > index 78f17f8bd..12966f532 100755 > > > --- a/.ci/linux-build.sh > > > +++ b/.ci/linux-build.sh > > > @@ -83,6 +83,9 @@ function configure_gcc() > > > # do it directly because gcc-multilib is not available > > > # for arm64 > > > sudo apt update && sudo apt install -y gcc-multilib > > > + elif which dnf; then > > > + # Install equivalent of gcc-multilib for Fedora. > > > + sudo dnf -y update && sudo dnf -y install glibc-devel.i686 > > > > dnf always refreshes package cache. 'dnf update' will actually update > > all the packages to the latest versions. I'm not sure it is an intended > > behavior here. > > > > Yeah good point, we shouldn't update the packages just install the missing > one. So only the install part is needed, I'll wait for other reviews before > posting v2. I removed "dnf -u update" and applied this patch series to main. I thought of applying instead of spinning v2 just for this change. Numan > > > > > > > fi > > > fi > > > } > > > diff --git a/utilities/containers/fedora/Dockerfile > > b/utilities/containers/fedora/Dockerfile > > > index 9b8386aae..d40a7b31f 100755 > > > --- a/utilities/containers/fedora/Dockerfile > > > +++ b/utilities/containers/fedora/Dockerfile > > > @@ -28,6 +28,7 @@ RUN dnf -y update \ > > > libtool \ > > > net-tools \ > > > nmap-ncat \ > > > + numactl-devel \ > > > openssl \ > > > openssl-devel \ > > > procps-ng \ > > > > > Thanks, > Ales > -- > > Ales Musil > > Senior Software Engineer - OVN Core > > Red Hat EMEA <https://www.redhat.com> > > amusil@redhat.com > <https://red.ht/sig> > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 78f17f8bd..12966f532 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -83,6 +83,9 @@ function configure_gcc() # do it directly because gcc-multilib is not available # for arm64 sudo apt update && sudo apt install -y gcc-multilib + elif which dnf; then + # Install equivalent of gcc-multilib for Fedora. + sudo dnf -y update && sudo dnf -y install glibc-devel.i686 fi fi } diff --git a/utilities/containers/fedora/Dockerfile b/utilities/containers/fedora/Dockerfile index 9b8386aae..d40a7b31f 100755 --- a/utilities/containers/fedora/Dockerfile +++ b/utilities/containers/fedora/Dockerfile @@ -28,6 +28,7 @@ RUN dnf -y update \ libtool \ net-tools \ nmap-ncat \ + numactl-devel \ openssl \ openssl-devel \ procps-ng \
There were two things missing for the Fedora builds, 32-bit version of glibc to allows the -m32 compilation on Fedora and numactl-devel package. Signed-off-by: Ales Musil <amusil@redhat.com> --- .ci/linux-build.sh | 3 +++ utilities/containers/fedora/Dockerfile | 1 + 2 files changed, 4 insertions(+)