From fc3b7173e1fbafd5cad9b48322a01049223ba548 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 13 Mar 2024 01:52:56 -0500 Subject: [PATCH] Add redhat support to docker hypervisor --- lib/beaker-hostgenerator/hypervisor/docker.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/beaker-hostgenerator/hypervisor/docker.rb b/lib/beaker-hostgenerator/hypervisor/docker.rb index 3601f84d..0b393e86 100644 --- a/lib/beaker-hostgenerator/hypervisor/docker.rb +++ b/lib/beaker-hostgenerator/hypervisor/docker.rb @@ -17,7 +17,7 @@ def generate_node(node_info, base_config, bhg_version) end base_config['image'] = image(ostype) - base_config['image'].prepend('amd64/') if node_info['bits'] == '64' && !base_config['image'].start_with?('quay.io/') + base_config['image'].prepend('amd64/') if node_info['bits'] == '64' && !base_config['image'].start_with?('quay.io/', 'registry.access.redhat.com/') base_generate_node(node_info, base_config, bhg_version, :docker) end @@ -32,6 +32,9 @@ def image(ostype) version = ostype.delete_prefix('centos') tag = (version.to_i >= 8) ? "stream#{version}" : "centos#{version}" image = "quay.io/centos/centos:#{tag}" + when /^redhat/ + version = ostype.delete_prefix('redhat') + image = "registry.access.redhat.com/ubi#{version}/ubi-init:latest" when /^oracle/ image.sub!(/\w+/, 'oraclelinux') when /^opensuse/ @@ -49,7 +52,7 @@ def image(ostype) def image_commands(ostype) case ostype - when /^(almalinux|centos|rocky|oracle)/ + when /^(almalinux|centos|rocky|oracle|redhat)/ [ 'cp /bin/true /sbin/agetty', el_package_install_command(ostype.delete_prefix(Regexp.last_match(1)).to_i),