Add OracleLinux 8 & 9 support

voxpupuli · Aug 11, 2023 · 1d43c43 · 1d43c43
1 parent b404e5c
commit 1d43c43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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"