From 6aa8192131169e277be2e44d8cf509ab6f5d5251 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 3 May 2024 18:15:37 -0700 Subject: [PATCH] Multi-arch support for container test (#83196) --- test/integration/targets/ansible-test-container/runme.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index be518528f12..9cfdd0e3d3a 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -11,6 +11,7 @@ import functools import json import os import pathlib +import platform import pwd import re import secrets @@ -977,9 +978,11 @@ class DnfBootstrapper(Bootstrapper): # In Fedora 39, the current version of containerd, 1.6.23, prevents Docker from working. # The previously tested version, 1.6.19, did not have this issue. # See: https://bugzilla.redhat.com/show_bug.cgi?id=2237396 + arch = platform.machine() + run_command( 'dnf', 'install', '-y', - 'https://kojipkgs.fedoraproject.org/packages/containerd/1.6.19/2.fc39/x86_64/containerd-1.6.19-2.fc39.x86_64.rpm' + f'https://kojipkgs.fedoraproject.org/packages/containerd/1.6.19/2.fc39/{arch}/containerd-1.6.19-2.fc39.{arch}.rpm' ) if os_release.id == 'rhel':