From c5a94f59dc8dde09a299037a7bb034d9aa461fd2 Mon Sep 17 00:00:00 2001
From: Ales Musil <amusil@redhat.com>
Date: Fri, 16 Feb 2024 07:38:31 +0100
Subject: [PATCH] ci: Update crun in Cirrus CI cloud image.

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 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1832e51f21..5ea936fea7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -57,6 +57,23 @@ 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
+    - mkdir -p "/root/.local/bin"
+    - curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64" -o "${HOME}/.local/bin/crun"
+    - chmod +x "/root/.local/bin/crun"
+    - mkdir -p "/root/.config/containers"
+
+  containers_conf_file:
+    path: /root/.config/containers/containers.conf
+    from_contents: |
+      [engine.runtimes]
+      crun = [
+      "${HOME}/.local/bin/crun",
+      "/usr/bin/crun"
+      ]
+
   download_cache_script:
     - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO} -o /tmp/image.tar