diff mbox series

[ovs-dev] ci: ovn-kubernetes: Move the fedora image version to 40.

Message ID 20241113205349.4029108-1-numans@ovn.org
State Changes Requested
Headers show
Series [ovs-dev] ci: ovn-kubernetes: Move the fedora image version to 40. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_ovn-kubernetes success github build: passed
ovsrobot/github-robot-_Build_and_Test fail github build: failed

Commit Message

Numan Siddique Nov. 13, 2024, 8:53 p.m. UTC 
From: Numan Siddique <numans@ovn.org>

fedora 37 is already end of life cycle.

The fedora version number can be passed to the Dockerfile of
ovn-kubernetes.

Signed-off-by: Numan Siddique <numans@ovn.org>
---
 .ci/ovn-kubernetes/Dockerfile        | 6 ++++--
 .github/workflows/ovn-kubernetes.yml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Ales Musil Nov. 14, 2024, 2:51 p.m. UTC | #1 
On Wed, Nov 13, 2024 at 9:54 PM <numans@ovn.org> wrote:

> From: Numan Siddique <numans@ovn.org>
>
> fedora 37 is already end of life cycle.
>
> The fedora version number can be passed to the Dockerfile of
> ovn-kubernetes.
>
> Signed-off-by: Numan Siddique <numans@ovn.org>
> ---
>


Hi Numan,

thank you for the patch, shouldn't we actually bump to the current 41?
With that we don't have to worry about the next bump till Fedora 44.

 .ci/ovn-kubernetes/Dockerfile        | 6 ++++--
>  .github/workflows/ovn-kubernetes.yml | 1 +
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
> index 554b5551b5..67108f15af 100644
> --- a/.ci/ovn-kubernetes/Dockerfile
> +++ b/.ci/ovn-kubernetes/Dockerfile
> @@ -1,7 +1,8 @@
>  ARG OVNKUBE_COMMIT
>  ARG GO_VERSION
> +ARG FEDORA_VERSION
>
> -FROM fedora:37 AS ovnbuilder
> +FROM fedora:$FEDORA_VERSION AS ovnbuilder
>
>  USER root
>
> @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker*
>  ARG GO_VERSION
>  FROM golang:$GO_VERSION as ovnkubebuilder
>  ARG OVNKUBE_COMMIT
> +ARG FEDORA_VERSION
>
>  # Clone OVN Kubernetes and build the binary based on the commit passed as
> argument
>  WORKDIR /root
> @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema
> pkg/sbdb/ovn-sb.ovsschema
>  RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make
>
>  # Build the final image
> -FROM fedora:37
> +FROM fedora:$FEDORA_VERSION
>
>  # install needed dependencies
>  RUN INSTALL_PKGS=" \
> diff --git a/.github/workflows/ovn-kubernetes.yml
> b/.github/workflows/ovn-kubernetes.yml
> index 50e48d11f8..f125d12528 100644
> --- a/.github/workflows/ovn-kubernetes.yml
> +++ b/.github/workflows/ovn-kubernetes.yml
> @@ -52,6 +52,7 @@ jobs:
>        run: |
>          docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }}
> \
>            --build-arg GO_VERSION=${{ env.GO_VERSION }} \
> +          --build-arg FEDORA_VERSION=40 \
>            --squash -t ovn-daemonset-f:dev -f
> .ci/ovn-kubernetes/Dockerfile .
>          mkdir /tmp/_output
>          docker save ovn-daemonset-f:dev > /tmp/_output/image.tar
> --
> 2.46.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
>
Thanks,
Ales
Numan Siddique Nov. 14, 2024, 3:27 p.m. UTC | #2 
On Thu, Nov 14, 2024 at 9:52 AM Ales Musil <amusil@redhat.com> wrote:
>
> On Wed, Nov 13, 2024 at 9:54 PM <numans@ovn.org> wrote:
>
> > From: Numan Siddique <numans@ovn.org>
> >
> > fedora 37 is already end of life cycle.
> >
> > The fedora version number can be passed to the Dockerfile of
> > ovn-kubernetes.
> >
> > Signed-off-by: Numan Siddique <numans@ovn.org>
> > ---
> >
>
>
> Hi Numan,
>
> thank you for the patch, shouldn't we actually bump to the current 41?
> With that we don't have to worry about the next bump till Fedora 44.

Oh yes.  I agree.   I'll wait for some reviews/Acks before submitting
another version.

Numan

>
>  .ci/ovn-kubernetes/Dockerfile        | 6 ++++--
> >  .github/workflows/ovn-kubernetes.yml | 1 +
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
> > index 554b5551b5..67108f15af 100644
> > --- a/.ci/ovn-kubernetes/Dockerfile
> > +++ b/.ci/ovn-kubernetes/Dockerfile
> > @@ -1,7 +1,8 @@
> >  ARG OVNKUBE_COMMIT
> >  ARG GO_VERSION
> > +ARG FEDORA_VERSION
> >
> > -FROM fedora:37 AS ovnbuilder
> > +FROM fedora:$FEDORA_VERSION AS ovnbuilder
> >
> >  USER root
> >
> > @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker*
> >  ARG GO_VERSION
> >  FROM golang:$GO_VERSION as ovnkubebuilder
> >  ARG OVNKUBE_COMMIT
> > +ARG FEDORA_VERSION
> >
> >  # Clone OVN Kubernetes and build the binary based on the commit passed as
> > argument
> >  WORKDIR /root
> > @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema
> > pkg/sbdb/ovn-sb.ovsschema
> >  RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make
> >
> >  # Build the final image
> > -FROM fedora:37
> > +FROM fedora:$FEDORA_VERSION
> >
> >  # install needed dependencies
> >  RUN INSTALL_PKGS=" \
> > diff --git a/.github/workflows/ovn-kubernetes.yml
> > b/.github/workflows/ovn-kubernetes.yml
> > index 50e48d11f8..f125d12528 100644
> > --- a/.github/workflows/ovn-kubernetes.yml
> > +++ b/.github/workflows/ovn-kubernetes.yml
> > @@ -52,6 +52,7 @@ jobs:
> >        run: |
> >          docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }}
> > \
> >            --build-arg GO_VERSION=${{ env.GO_VERSION }} \
> > +          --build-arg FEDORA_VERSION=40 \
> >            --squash -t ovn-daemonset-f:dev -f
> > .ci/ovn-kubernetes/Dockerfile .
> >          mkdir /tmp/_output
> >          docker save ovn-daemonset-f:dev > /tmp/_output/image.tar
> > --
> > 2.46.0
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
> >
> 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
Dumitru Ceara Dec. 11, 2024, 12:23 p.m. UTC | #3 
On 11/14/24 4:27 PM, Numan Siddique wrote:
> On Thu, Nov 14, 2024 at 9:52 AM Ales Musil <amusil@redhat.com> wrote:
>>
>> On Wed, Nov 13, 2024 at 9:54 PM <numans@ovn.org> wrote:
>>
>>> From: Numan Siddique <numans@ovn.org>
>>>
>>> fedora 37 is already end of life cycle.
>>>
>>> The fedora version number can be passed to the Dockerfile of
>>> ovn-kubernetes.
>>>
>>> Signed-off-by: Numan Siddique <numans@ovn.org>
>>> ---
>>>
>>
>>
>> Hi Numan,
>>
>> thank you for the patch, shouldn't we actually bump to the current 41?
>> With that we don't have to worry about the next bump till Fedora 44.
> 
> Oh yes.  I agree.   I'll wait for some reviews/Acks before submitting
> another version.
> 

Hi Numan, Ales,

We might need some more changes when bumping to Fedora 41.  I see this
in CI:


#46 [stage-2  7/18] RUN dnf install -y *.rpm && rm -f *.rpm
#46 0.254 Updating and loading repositories:
#46 0.709 Repositories loaded.
#46 1.039 Failed to resolve the transaction:
#46 1.039 Problem: conflicting requests
#46 1.039   - nothing provides network-scripts needed by
network-scripts-openvswitch-3.4.1-1.fc41.x86_64 from @commandline
#46 1.039 You can try to add to command line:
#46 1.040   --skip-broken to skip uninstallable packages
#46 ERROR: process "/bin/sh -c dnf install -y *.rpm && rm -f *.rpm" did
not complete successfully: exit code: 1

https://github.com/dceara/ovn/actions/runs/12276055961/job/34252437308#step:6:9363

Regards,
Dumitru

> Numan
> 
>>
>>  .ci/ovn-kubernetes/Dockerfile        | 6 ++++--
>>>  .github/workflows/ovn-kubernetes.yml | 1 +
>>>  2 files changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
>>> index 554b5551b5..67108f15af 100644
>>> --- a/.ci/ovn-kubernetes/Dockerfile
>>> +++ b/.ci/ovn-kubernetes/Dockerfile
>>> @@ -1,7 +1,8 @@
>>>  ARG OVNKUBE_COMMIT
>>>  ARG GO_VERSION
>>> +ARG FEDORA_VERSION
>>>
>>> -FROM fedora:37 AS ovnbuilder
>>> +FROM fedora:$FEDORA_VERSION AS ovnbuilder
>>>
>>>  USER root
>>>
>>> @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker*
>>>  ARG GO_VERSION
>>>  FROM golang:$GO_VERSION as ovnkubebuilder
>>>  ARG OVNKUBE_COMMIT
>>> +ARG FEDORA_VERSION
>>>
>>>  # Clone OVN Kubernetes and build the binary based on the commit passed as
>>> argument
>>>  WORKDIR /root
>>> @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema
>>> pkg/sbdb/ovn-sb.ovsschema
>>>  RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make
>>>
>>>  # Build the final image
>>> -FROM fedora:37
>>> +FROM fedora:$FEDORA_VERSION
>>>
>>>  # install needed dependencies
>>>  RUN INSTALL_PKGS=" \
>>> diff --git a/.github/workflows/ovn-kubernetes.yml
>>> b/.github/workflows/ovn-kubernetes.yml
>>> index 50e48d11f8..f125d12528 100644
>>> --- a/.github/workflows/ovn-kubernetes.yml
>>> +++ b/.github/workflows/ovn-kubernetes.yml
>>> @@ -52,6 +52,7 @@ jobs:
>>>        run: |
>>>          docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }}
>>> \
>>>            --build-arg GO_VERSION=${{ env.GO_VERSION }} \
>>> +          --build-arg FEDORA_VERSION=40 \
>>>            --squash -t ovn-daemonset-f:dev -f
>>> .ci/ovn-kubernetes/Dockerfile .
>>>          mkdir /tmp/_output
>>>          docker save ovn-daemonset-f:dev > /tmp/_output/image.tar
>>> --
>>> 2.46.0
>>>
>>> _______________________________________________
>>> dev mailing list
>>> dev@openvswitch.org
>>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>>
>>>
>> 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
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Numan Siddique Dec. 12, 2024, 11:30 p.m. UTC | #4 
On Wed, Dec 11, 2024 at 4:24 AM Dumitru Ceara <dceara@redhat.com> wrote:
>
> On 11/14/24 4:27 PM, Numan Siddique wrote:
> > On Thu, Nov 14, 2024 at 9:52 AM Ales Musil <amusil@redhat.com> wrote:
> >>
> >> On Wed, Nov 13, 2024 at 9:54 PM <numans@ovn.org> wrote:
> >>
> >>> From: Numan Siddique <numans@ovn.org>
> >>>
> >>> fedora 37 is already end of life cycle.
> >>>
> >>> The fedora version number can be passed to the Dockerfile of
> >>> ovn-kubernetes.
> >>>
> >>> Signed-off-by: Numan Siddique <numans@ovn.org>
> >>> ---
> >>>
> >>
> >>
> >> Hi Numan,
> >>
> >> thank you for the patch, shouldn't we actually bump to the current 41?
> >> With that we don't have to worry about the next bump till Fedora 44.
> >
> > Oh yes.  I agree.   I'll wait for some reviews/Acks before submitting
> > another version.
> >
>
> Hi Numan, Ales,
>
> We might need some more changes when bumping to Fedora 41.  I see this
> in CI:
>
>
> #46 [stage-2  7/18] RUN dnf install -y *.rpm && rm -f *.rpm
> #46 0.254 Updating and loading repositories:
> #46 0.709 Repositories loaded.
> #46 1.039 Failed to resolve the transaction:
> #46 1.039 Problem: conflicting requests
> #46 1.039   - nothing provides network-scripts needed by
> network-scripts-openvswitch-3.4.1-1.fc41.x86_64 from @commandline
> #46 1.039 You can try to add to command line:
> #46 1.040   --skip-broken to skip uninstallable packages
> #46 ERROR: process "/bin/sh -c dnf install -y *.rpm && rm -f *.rpm" did
> not complete successfully: exit code: 1
>
> https://github.com/dceara/ovn/actions/runs/12276055961/job/34252437308#step:6:9363
>

Thanks for pointing this out.  Let me see why it's breaking.

Numan

> Regards,
> Dumitru
>
> > Numan
> >
> >>
> >>  .ci/ovn-kubernetes/Dockerfile        | 6 ++++--
> >>>  .github/workflows/ovn-kubernetes.yml | 1 +
> >>>  2 files changed, 5 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
> >>> index 554b5551b5..67108f15af 100644
> >>> --- a/.ci/ovn-kubernetes/Dockerfile
> >>> +++ b/.ci/ovn-kubernetes/Dockerfile
> >>> @@ -1,7 +1,8 @@
> >>>  ARG OVNKUBE_COMMIT
> >>>  ARG GO_VERSION
> >>> +ARG FEDORA_VERSION
> >>>
> >>> -FROM fedora:37 AS ovnbuilder
> >>> +FROM fedora:$FEDORA_VERSION AS ovnbuilder
> >>>
> >>>  USER root
> >>>
> >>> @@ -37,6 +38,7 @@ RUN rm rpm/rpmbuild/RPMS/x86_64/*docker*
> >>>  ARG GO_VERSION
> >>>  FROM golang:$GO_VERSION as ovnkubebuilder
> >>>  ARG OVNKUBE_COMMIT
> >>> +ARG FEDORA_VERSION
> >>>
> >>>  # Clone OVN Kubernetes and build the binary based on the commit passed as
> >>> argument
> >>>  WORKDIR /root
> >>> @@ -63,7 +65,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema
> >>> pkg/sbdb/ovn-sb.ovsschema
> >>>  RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make
> >>>
> >>>  # Build the final image
> >>> -FROM fedora:37
> >>> +FROM fedora:$FEDORA_VERSION
> >>>
> >>>  # install needed dependencies
> >>>  RUN INSTALL_PKGS=" \
> >>> diff --git a/.github/workflows/ovn-kubernetes.yml
> >>> b/.github/workflows/ovn-kubernetes.yml
> >>> index 50e48d11f8..f125d12528 100644
> >>> --- a/.github/workflows/ovn-kubernetes.yml
> >>> +++ b/.github/workflows/ovn-kubernetes.yml
> >>> @@ -52,6 +52,7 @@ jobs:
> >>>        run: |
> >>>          docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }}
> >>> \
> >>>            --build-arg GO_VERSION=${{ env.GO_VERSION }} \
> >>> +          --build-arg FEDORA_VERSION=40 \
> >>>            --squash -t ovn-daemonset-f:dev -f
> >>> .ci/ovn-kubernetes/Dockerfile .
> >>>          mkdir /tmp/_output
> >>>          docker save ovn-daemonset-f:dev > /tmp/_output/image.tar
> >>> --
> >>> 2.46.0
> >>>
> >>> _______________________________________________
> >>> dev mailing list
> >>> dev@openvswitch.org
> >>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >>>
> >>>
> >> 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
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox series

Patch

diff --git a/.ci/ovn-kubernetes/Dockerfile b/.ci/ovn-kubernetes/Dockerfile
index 554b5551b5..67108f15af 100644
--- a/.ci/ovn-kubernetes/Dockerfile
+++ b/.ci/ovn-kubernetes/Dockerfile
@@ -1,7 +1,8 @@ 
 ARG OVNKUBE_COMMIT
 ARG GO_VERSION
+ARG FEDORA_VERSION
 
-FROM fedora:37 AS ovnbuilder
+FROM fedora:$FEDORA_VERSION AS ovnbuilder
 
 USER root
 
@@ -37,6 +38,7 @@  RUN rm rpm/rpmbuild/RPMS/x86_64/*docker*
 ARG GO_VERSION
 FROM golang:$GO_VERSION as ovnkubebuilder
 ARG OVNKUBE_COMMIT
+ARG FEDORA_VERSION
 
 # Clone OVN Kubernetes and build the binary based on the commit passed as argument
 WORKDIR /root
@@ -63,7 +65,7 @@  COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema pkg/sbdb/ovn-sb.ovsschema
 RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make
 
 # Build the final image
-FROM fedora:37
+FROM fedora:$FEDORA_VERSION
 
 # install needed dependencies
 RUN INSTALL_PKGS=" \
diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml
index 50e48d11f8..f125d12528 100644
--- a/.github/workflows/ovn-kubernetes.yml
+++ b/.github/workflows/ovn-kubernetes.yml
@@ -52,6 +52,7 @@  jobs:
       run: |
         docker build --build-arg OVNKUBE_COMMIT=${{ env.OVNKUBE_COMMIT }} \
           --build-arg GO_VERSION=${{ env.GO_VERSION }} \
+          --build-arg FEDORA_VERSION=40 \
           --squash -t ovn-daemonset-f:dev -f .ci/ovn-kubernetes/Dockerfile .
         mkdir /tmp/_output
         docker save ovn-daemonset-f:dev > /tmp/_output/image.tar