Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OracleLinux 8 & 9 support #321

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Add OracleLinux 8 & 9 support #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/beaker-hostgenerator/data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,9 +1084,9 @@ def generate_osinfo
end
end

# Oracle
# Oracle / OracleLinux
yield ['oracle6-32', 'el-6-i386']
(6..7).each do |release|
(6..9).each do |release|
yield ["oracle#{release}-64", "el-#{release}-x86_64"]
end

Expand Down
2 changes: 1 addition & 1 deletion lib/beaker-hostgenerator/hypervisor/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/per-host-settings/docker-regex-validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down