On 2/27/24 17:28, Mohammad Heib wrote:
> There are some issues with older crun and newer kernel
> combination [0]. Unfortunately Ubuntu 22.04 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: Mohammad Heib <mh...@redhat.com>
> ---

Hi Mohammad,

Thanks for working on fixing the CI!

>  .github/workflows/ovn-fake-multinode-tests.yml | 8 ++++++++
>  .github/workflows/ovn-kubernetes.yml           | 8 ++++++++
>  .github/workflows/test.yml                     | 8 ++++++++
>  3 files changed, 24 insertions(+)
> 
> diff --git a/.github/workflows/ovn-fake-multinode-tests.yml 
> b/.github/workflows/ovn-fake-multinode-tests.yml
> index 179c1d662..79b6c4253 100644
> --- a/.github/workflows/ovn-fake-multinode-tests.yml
> +++ b/.github/workflows/ovn-fake-multinode-tests.yml
> @@ -137,6 +137,14 @@ jobs:
>          sudo systemctl start openvswitch-switch
>          sudo ovs-vsctl show
>  
> +    # XXX This should be removed when native crun >=1.9.1
> +    - name: update crun script
> +      run: |
> +        crun --version
> +        sudo curl -L 
> "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-amd64";
>  -o /usr/bin/crun
> +        sudo chmod +x /usr/bin/crun
> +        echo "New crun version: "$(crun --version)
> +
>      - name: Start basic cluster
>        run: |
>          sudo -E ./ovn_cluster.sh start
> diff --git a/.github/workflows/ovn-kubernetes.yml 
> b/.github/workflows/ovn-kubernetes.yml
> index 0f2b30497..09a838cfe 100644
> --- a/.github/workflows/ovn-kubernetes.yml
> +++ b/.github/workflows/ovn-kubernetes.yml
> @@ -140,6 +140,14 @@ jobs:
>        run: |
>          docker load --input image.tar && rm -rf image.tar
>  
> +    # XXX This should be removed when native crun >=1.9.1
> +    - name: update crun script
> +      run: |
> +        crun --version
> +        sudo curl -L 
> "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-amd64";
>  -o /usr/bin/crun
> +        sudo chmod +x /usr/bin/crun
> +        echo "New crun version: "$(crun --version)
> +

We don't install podman anywhere for ovn-kubernetes jobs (maybe we
should but that's a different story) so kind will use docker.  I don't
think we need to update (install?) crun.  AFAICT docker/containerd uses
runc as runtime so we shouldn't be having any issues for ovn-k jobs.

What do you think?

>      - name: kind setup
>        run: |
>          export OVN_IMAGE="ovn-daemonset-f:dev"
> diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
> index 2def39531..0cb981775 100644
> --- a/.github/workflows/test.yml
> +++ b/.github/workflows/test.yml
> @@ -217,6 +217,14 @@ jobs:
>          path: /tmp/image.tar
>          key: ${{ github.sha }}
>  
> +    # XXX This should be removed when native crun >=1.9.1
> +    - name: update crun script
> +      run: |
> +        crun --version
> +        sudo curl -L 
> "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-amd64";
>  -o /usr/bin/crun
> +        sudo chmod +x /usr/bin/crun
> +        echo "New crun version: "$(crun --version)
> +
>      - name: load image
>        run: |
>          sudo podman load -i /tmp/image.tar

The rest looks good to me, thanks!

Regards,
Dumitru

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to