diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb index 60538fa8..a96c670b 100644 --- a/lib/beaker-hostgenerator/data.rb +++ b/lib/beaker-hostgenerator/data.rb @@ -1090,6 +1090,11 @@ def generate_osinfo yield ["oracle#{release}-64", "el-#{release}-x86_64"] end + # OracleLinux + (7..9).each do |release| + yield ["oracle#{release}-64", "el-#{release}-x86_64"] + end + # Scientific Linux yield ['scientific7-64', 'el-7-x86_64'] diff --git a/lib/beaker-hostgenerator/hypervisor/docker.rb b/lib/beaker-hostgenerator/hypervisor/docker.rb index f6a150fb..5f180b56 100644 --- a/lib/beaker-hostgenerator/hypervisor/docker.rb +++ b/lib/beaker-hostgenerator/hypervisor/docker.rb @@ -49,7 +49,7 @@ def image(ostype) def image_commands(ostype) case ostype - when /^(almalinux|centos|rocky)/ + when /^(almalinux|centos|rocky|oracle)/ [ 'cp /bin/true /sbin/agetty', el_package_install_command(ostype.delete_prefix(Regexp.last_match(1)).to_i), diff --git a/test/fixtures/per-host-settings/docker-regex-validation.yaml b/test/fixtures/per-host-settings/docker-regex-validation.yaml index 47f8db70..b1822dbd 100644 --- a/test/fixtures/per-host-settings/docker-regex-validation.yaml +++ b/test/fixtures/per-host-settings/docker-regex-validation.yaml @@ -10,6 +10,9 @@ expected_hash: hypervisor: docker roles: - agent + docker_image_commands: + - cp /bin/true /sbin/agetty + - yum install -y crontabs initscripts iproute openssl wget which sysvinit-tools tar ss opensuse15-64-1: docker_cmd: - "/sbin/init"