diff options
| author | Matt Martz <matt@sivel.net> | 2023-10-02 20:30:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 20:30:31 +0200 |
| commit | e78cc1e60244fb6cb26ccbdd510b63e20fbf3297 (patch) | |
| tree | 67559dfbf8843228db54a0cabeabd9ab79b5ba13 | |
| parent | Fix reporting role as not found when remote_data is None (#81829) (diff) | |
| download | ansible-e78cc1e60244fb6cb26ccbdd510b63e20fbf3297.tar.xz ansible-e78cc1e60244fb6cb26ccbdd510b63e20fbf3297.zip | |
Install upgraded crun from edge (#81833)
| -rwxr-xr-x | test/integration/targets/ansible-test-container/runme.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 55c9b7dccc..a99004a098 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1052,9 +1052,15 @@ class ApkBootstrapper(Bootstrapper): # The `openssl` package is used to generate hashed passwords. # crun added as podman won't install it as dep if runc is present # but we don't want runc as it fails - packages = ['docker', 'podman', 'openssl', 'crun'] + # The edge `crun` package installed below requires ip6tables, and in + # edge, the `iptables` package includes `ip6tables`, but in 3.18 they + # are separate. Remove `ip6tables` once we update to 3.19. + packages = ['docker', 'podman', 'openssl', 'crun', 'ip6tables'] run_command('apk', 'add', *packages) + # 3.18 only contains crun 1.8.4, to get 1.9.2 to resolve the run/shm issue, install crun from edge + # Remove once we update to 3.19 + run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun') run_command('service', 'docker', 'start') run_command('modprobe', 'tun') |