| Message ID | 20210723200515.19896-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ci: Use OVS packages built from submodule. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
On Fri, Jul 23, 2021 at 4:05 PM Dumitru Ceara <dceara@redhat.com> wrote: > > The ovn-kubernetes CI job builds OVS RPMs from the submodule sources but > only installs the x86 ones. The noarch dependencies are pulled from > other sources and may not exist yet (e.g., OVS submodule points to a > commit on the OVS master branch with no official release). > > Fixes: b35a6f0faded ("add ovn-kubernetes job to github actions") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> Thanks Dumitru. I applied this patch to the main branch. Numan > --- > .ci/ovn-kubernetes/Dockerfile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile > index ba04fb199..43c2bfbb5 100644 > --- a/.ci/ovn-kubernetes/Dockerfile > +++ b/.ci/ovn-kubernetes/Dockerfile > @@ -58,6 +58,7 @@ RUN mkdir -p /var/run/openvswitch > # install openvswitch and ovn rpms built in previous stages > COPY --from=ovnbuilder /tmp/ovn/rpm/rpmbuild/RPMS/x86_64/*rpm ./ > COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/x86_64/*rpm ./ > +COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/noarch/*rpm ./ > RUN dnf install -y *.rpm && rm -f *.rpm > > # install ovn-kubernetes binaries built in previous stage > -- > 2.27.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile index ba04fb199..43c2bfbb5 100644 --- a/.ci/ovn-kubernetes/Dockerfile +++ b/.ci/ovn-kubernetes/Dockerfile @@ -58,6 +58,7 @@ RUN mkdir -p /var/run/openvswitch # install openvswitch and ovn rpms built in previous stages COPY --from=ovnbuilder /tmp/ovn/rpm/rpmbuild/RPMS/x86_64/*rpm ./ COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/x86_64/*rpm ./ +COPY --from=ovnbuilder /tmp/ovn/ovs/rpm/rpmbuild/RPMS/noarch/*rpm ./ RUN dnf install -y *.rpm && rm -f *.rpm # install ovn-kubernetes binaries built in previous stage
The ovn-kubernetes CI job builds OVS RPMs from the submodule sources but only installs the x86 ones. The noarch dependencies are pulled from other sources and may not exist yet (e.g., OVS submodule points to a commit on the OVS master branch with no official release). Fixes: b35a6f0faded ("add ovn-kubernetes job to github actions") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- .ci/ovn-kubernetes/Dockerfile | 1 + 1 file changed, 1 insertion(+)