From cbf4fc86a19525763d0e3fe3c4281c2d59d992f3 Mon Sep 17 00:00:00 2001
From: Mohammad Heib <mheib@redhat.com>
Date: Wed, 28 Feb 2024 09:18:09 +0200
Subject: [PATCH] ci: Update crun in GitHub actions runner.

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 <mheib@redhat.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 .github/workflows/ovn-fake-multinode-tests.yml | 8 ++++++++
 .github/workflows/test.yml                     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/workflows/ovn-fake-multinode-tests.yml b/.github/workflows/ovn-fake-multinode-tests.yml
index 179c1d662a..79b6c42539 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/test.yml b/.github/workflows/test.yml
index 2def395315..0cb9817754 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