From cb82ddec02d3caeb8d64b525f55529259e036038 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Wed, 13 Mar 2024 14:05:58 -0500 Subject: [PATCH] [stable-2.14] Install crun from Alpine 3.19 for known musl compatibility (#82812). (#82816) (cherry picked from commit 86f48a526ab0959cb964eac54c9bebb7f7a4dce1) --- test/integration/targets/ansible-test-container/runme.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 57cbc7ca17c..dce79b23df8 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1058,8 +1058,8 @@ class ApkBootstrapper(Bootstrapper): packages = ['docker', 'podman', 'openssl', 'crun', 'ip6tables'] run_command('apk', 'add', *packages) - # 3.16 only contains crun 1.4.5, to get 1.9.2 to resolve the run/shm issue, install crun from edge - run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun') + # 3.16 only contains crun 1.4.5, to get 1.9.2 to resolve the run/shm issue, install crun from 3.19 + run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/v3.19/community', 'crun') run_command('service', 'docker', 'start') run_command('modprobe', 'tun')