diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 7c1791e9529..d41152612df 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -118,6 +118,8 @@ stages: targets: - name: Alpine 3.17 test: alpine/3.17 + - name: Alpine 3.18 + test: alpine/3.18 - name: Fedora 37 test: fedora/37 - name: Fedora 38 diff --git a/changelogs/fragments/ansible_test_alpine_3.18.yml b/changelogs/fragments/ansible_test_alpine_3.18.yml new file mode 100644 index 00000000000..b4220baecd9 --- /dev/null +++ b/changelogs/fragments/ansible_test_alpine_3.18.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Add Alpine 3.18 to remotes diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 687128056f7..55c9b7dcccd 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1050,7 +1050,9 @@ class ApkBootstrapper(Bootstrapper): def run(cls) -> None: """Run the bootstrapper.""" # The `openssl` package is used to generate hashed passwords. - packages = ['docker', 'podman', 'openssl'] + # 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'] run_command('apk', 'add', *packages) run_command('service', 'docker', 'start') diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 28d5f4fb534..5f4d35680fc 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -1,4 +1,5 @@ alpine/3.17 python=3.10 become=doas_sudo provider=aws arch=x86_64 +alpine/3.18 python=3.11 become=doas_sudo provider=aws arch=x86_64 alpine become=doas_sudo provider=aws arch=x86_64 fedora/37 python=3.11 become=sudo provider=aws arch=x86_64 fedora/38 python=3.11 become=sudo provider=aws arch=x86_64