diff mbox series

[ovs-dev,v2] ci: Update crun in Cirrus CI cloud image.

Message ID 20240216134046.3351533-1-amusil@redhat.com
State Accepted
Headers show
Series [ovs-dev,v2] ci: Update crun in Cirrus CI cloud image. | expand

Checks

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 success github build: passed

Commit Message

Ales Musil Feb. 16, 2024, 1:40 p.m. UTC
There are some issues with older crun and newer kernel
combination [0]. Unfortunately Ubuntu 23.10 falls into this
category and the jobs will often time fail. Temoprarily use
newer crun from git that has the fix [1].

[0] https://github.com/containers/crun/pull/1309
[1] https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/

Signed-off-by: Ales Musil <amusil@redhat.com>
---
 .cirrus.yml | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Dumitru Ceara Feb. 16, 2024, 2:51 p.m. UTC | #1
On 2/16/24 14:40, Ales Musil wrote:
> There are some issues with older crun and newer kernel
> combination [0]. Unfortunately Ubuntu 23.10 falls into this
> category and the jobs will often time fail. Temoprarily use
> newer crun from git that has the fix [1].
> 
> [0] https://github.com/containers/crun/pull/1309
> [1] https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
> 
> Signed-off-by: Ales Musil <amusil@redhat.com>
> ---

Hi Ales,

>  .cirrus.yml | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 1832e51f2..0a16d7b5f 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -57,6 +57,12 @@ arm_unit_tests_task:
>      - sudo apt update
>      - sudo apt install -y podman
>  
> +  #  XXX This should be removed when native crun >=1.9.1
> +  update_crun_script:
> +    - crun --version
> +    - curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64" -o /usr/bin/crun
> +    - chmod +x /usr/bin/crun
> +

A bit unfortunate that we have to do this but it seems to work.  It
passes in my fork:

https://cirrus-ci.com/build/6433082459291648

>    download_cache_script:
>      - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO} -o /tmp/image.tar
>  

Acked-by: Dumitru Ceara <dceara@redhat.com>

Thanks,
Dumitru
Numan Siddique Feb. 16, 2024, 3:26 p.m. UTC | #2
On Fri, Feb 16, 2024 at 9:52 AM Dumitru Ceara <dceara@redhat.com> wrote:
>
> On 2/16/24 14:40, Ales Musil wrote:
> > There are some issues with older crun and newer kernel
> > combination [0]. Unfortunately Ubuntu 23.10 falls into this
> > category and the jobs will often time fail. Temoprarily use
> > newer crun from git that has the fix [1].
> >
> > [0] https://github.com/containers/crun/pull/1309
> > [1] https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
> >
> > Signed-off-by: Ales Musil <amusil@redhat.com>
> > ---
>
> Hi Ales,
>
> >  .cirrus.yml | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/.cirrus.yml b/.cirrus.yml
> > index 1832e51f2..0a16d7b5f 100644
> > --- a/.cirrus.yml
> > +++ b/.cirrus.yml
> > @@ -57,6 +57,12 @@ arm_unit_tests_task:
> >      - sudo apt update
> >      - sudo apt install -y podman
> >
> > +  #  XXX This should be removed when native crun >=1.9.1
> > +  update_crun_script:
> > +    - crun --version
> > +    - curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64" -o /usr/bin/crun
> > +    - chmod +x /usr/bin/crun
> > +
>
> A bit unfortunate that we have to do this but it seems to work.  It
> passes in my fork:
>
> https://cirrus-ci.com/build/6433082459291648
>
> >    download_cache_script:
> >      - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO} -o /tmp/image.tar
> >
>
> Acked-by: Dumitru Ceara <dceara@redhat.com>

Thanks.  I applied this patch to main and branch-24.03.

Does it need a backport to older branches ?   I suppose so.

I've one follow up comment if it makes sense.  Is it possible to check
the version of installed cron and only download
if installed cron < 1.14.1 ?   This way we don't have to monitor the
cron version manually to remove this script.

Thanks
Numan





>
> Thanks,
> Dumitru
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Ales Musil Feb. 16, 2024, 3:34 p.m. UTC | #3
On Fri, Feb 16, 2024 at 4:27 PM Numan Siddique <numans@ovn.org> wrote:

> On Fri, Feb 16, 2024 at 9:52 AM Dumitru Ceara <dceara@redhat.com> wrote:
> >
> > On 2/16/24 14:40, Ales Musil wrote:
> > > There are some issues with older crun and newer kernel
> > > combination [0]. Unfortunately Ubuntu 23.10 falls into this
> > > category and the jobs will often time fail. Temoprarily use
> > > newer crun from git that has the fix [1].
> > >
> > > [0] https://github.com/containers/crun/pull/1309
> > > [1]
> https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
> > >
> > > Signed-off-by: Ales Musil <amusil@redhat.com>
> > > ---
> >
> > Hi Ales,
> >
> > >  .cirrus.yml | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > >
> > > diff --git a/.cirrus.yml b/.cirrus.yml
> > > index 1832e51f2..0a16d7b5f 100644
> > > --- a/.cirrus.yml
> > > +++ b/.cirrus.yml
> > > @@ -57,6 +57,12 @@ arm_unit_tests_task:
> > >      - sudo apt update
> > >      - sudo apt install -y podman
> > >
> > > +  #  XXX This should be removed when native crun >=1.9.1
> > > +  update_crun_script:
> > > +    - crun --version
> > > +    - curl -L "
> https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64"
> -o /usr/bin/crun
> > > +    - chmod +x /usr/bin/crun
> > > +
> >
> > A bit unfortunate that we have to do this but it seems to work.  It
> > passes in my fork:
> >
> > https://cirrus-ci.com/build/6433082459291648
> >
> > >    download_cache_script:
> > >      - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO}
> -o /tmp/image.tar
> > >
> >
> > Acked-by: Dumitru Ceara <dceara@redhat.com>
>

Hi Numan,


> Thanks.  I applied this patch to main and branch-24.03.
>

> Does it need a backport to older branches ?   I suppose so.
>

It should be backported down to 23.06 AFAIK.


>
> I've one follow up comment if it makes sense.  Is it possible to check
> the version of installed cron and only download
> if installed cron < 1.14.1 ?   This way we don't have to monitor the
> cron version manually to remove this script.
>

We could do that, however Ubuntu 24.04 should use 1.14.1 so we need to
switch the images once they are available.


>
> Thanks
> Numan
>
>
>
>
>
> >
> > Thanks,
> > Dumitru
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
>
>
Thanks,
Ales
Dumitru Ceara Feb. 28, 2024, 10:54 a.m. UTC | #4
On 2/16/24 16:34, Ales Musil wrote:
> On Fri, Feb 16, 2024 at 4:27 PM Numan Siddique <numans@ovn.org> wrote:
> 
>> On Fri, Feb 16, 2024 at 9:52 AM Dumitru Ceara <dceara@redhat.com> wrote:
>>>
>>> On 2/16/24 14:40, Ales Musil wrote:
>>>> There are some issues with older crun and newer kernel
>>>> combination [0]. Unfortunately Ubuntu 23.10 falls into this
>>>> category and the jobs will often time fail. Temoprarily use
>>>> newer crun from git that has the fix [1].
>>>>
>>>> [0] https://github.com/containers/crun/pull/1309
>>>> [1]
>> https://noobient.com/2023/11/15/fixing-ubuntu-containers-failing-to-start-with-systemd/
>>>>
>>>> Signed-off-by: Ales Musil <amusil@redhat.com>
>>>> ---
>>>
>>> Hi Ales,
>>>
>>>>  .cirrus.yml | 6 ++++++
>>>>  1 file changed, 6 insertions(+)
>>>>
>>>> diff --git a/.cirrus.yml b/.cirrus.yml
>>>> index 1832e51f2..0a16d7b5f 100644
>>>> --- a/.cirrus.yml
>>>> +++ b/.cirrus.yml
>>>> @@ -57,6 +57,12 @@ arm_unit_tests_task:
>>>>      - sudo apt update
>>>>      - sudo apt install -y podman
>>>>
>>>> +  #  XXX This should be removed when native crun >=1.9.1
>>>> +  update_crun_script:
>>>> +    - crun --version
>>>> +    - curl -L "
>> https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64"
>> -o /usr/bin/crun
>>>> +    - chmod +x /usr/bin/crun
>>>> +
>>>
>>> A bit unfortunate that we have to do this but it seems to work.  It
>>> passes in my fork:
>>>
>>> https://cirrus-ci.com/build/6433082459291648
>>>
>>>>    download_cache_script:
>>>>      - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO}
>> -o /tmp/image.tar
>>>>
>>>
>>> Acked-by: Dumitru Ceara <dceara@redhat.com>
>>
> 
> Hi Numan,
> 
> 
>> Thanks.  I applied this patch to main and branch-24.03.
>>
> 
>> Does it need a backport to older branches ?   I suppose so.
>>
> 
> It should be backported down to 23.06 AFAIK.
> 

I pushed this patch to 23.06 and 23.09 too now.

Thanks,
Dumitru
diff mbox series

Patch

diff --git a/.cirrus.yml b/.cirrus.yml
index 1832e51f2..0a16d7b5f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -57,6 +57,12 @@  arm_unit_tests_task:
     - sudo apt update
     - sudo apt install -y podman
 
+  #  XXX This should be removed when native crun >=1.9.1
+  update_crun_script:
+    - crun --version
+    - curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64" -o /usr/bin/crun
+    - chmod +x /usr/bin/crun
+
   download_cache_script:
     - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO} -o /tmp/image.tar