Merge pull request #123 from treydock/amazon-2023

Support Amazon Linux 2023
voxpupuli · Mar 14, 2024 · 8e2e571 · 8e2e571
2 parents 72dda38 + 079d44c
commit 8e2e571
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/beaker/hypervisor/docker.rb b/lib/beaker/hypervisor/docker.rb
@@ -375,7 +375,7 @@ def install_ssh_components(container, host)
         container.exec(%w[apt-get update])
         container.exec(%w[apt-get install -y openssh-server openssh-client])
         container.exec(%w[sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*])
-      when /el-[89]/, /fedora-(2[2-9]|3[0-9])/
+      when /el-[89]/, /fedora-(2[2-9]|3[0-9])/, /amazon-2023/
         container.exec(%w[dnf clean all])
         container.exec(%w[dnf install -y sudo openssh-server openssh-clients])
         container.exec(%w[ssh-keygen -A])
@@ -509,7 +509,7 @@ def dockerfile_for(host)
           RUN apt-get update \
           && apt-get install -y openssh-server openssh-client #{additional_packages.join(' ')}
         DF
-      when /el-[89]/, /fedora-(2[2-9]|3)/
+      when /el-[89]/, /fedora-(2[2-9]|3)/, /amazon-2023/
         dockerfile += <<~DF
           RUN dnf clean all \
           && dnf install -y sudo openssh-server openssh-clients #{additional_packages.join(' ')} \

diff --git a/spec/beaker/hypervisor/docker_spec.rb b/spec/beaker/hypervisor/docker_spec.rb
@@ -11,6 +11,7 @@ module Beaker
     'centos-7-x86_64',
     'sles-12-x86_64',
     'archlinux-2017.12.27-x86_64',
+    'amazon-2023-x86_64',
   ]
 
   describe Docker do