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.

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

feat: oracle 8.9 support #1165

Merged
merged 1 commit into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/aws-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ jobs:
buildConfig: "basic"
- os: "sles 15"
buildConfig: "nvidia"
# Oracle 7.9
- os: "oracle 7.9"
# Oracle 8.9
- os: "oracle 8.9"
buildConfig: "basic"
- os: "oracle 7.9"
- os: "oracle 8.9"
buildConfig: "fips"
- os: "oracle 7.9"
- os: "oracle 8.9"
buildConfig: "rhck"
# Flatcar
- os: "flatcar"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-ami.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
max-parallel: 10
matrix:
include:
- os: "oracle 7.9"
- os: "oracle 8.9"
buildConfig: "fips"
- os: "redhat 8.6"
buildConfig: "offline"
Expand Down
13 changes: 0 additions & 13 deletions ansible/roles/repo/files/etc/yum.repos.d/epel-7.repo

This file was deleted.

7 changes: 0 additions & 7 deletions ansible/roles/repo/tasks/redhat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@
when:
- ansible_distribution_major_version == '8'

- name: add EPEL rpm repository
copy:
src: files/etc/yum.repos.d/epel-7.repo
dest: /etc/yum.repos.d/epel.repo
when:
- ansible_distribution_major_version == '7'

# RPM
- name: add Konvoy Kubernetes rpm repository
yum_repository:
Expand Down
27 changes: 0 additions & 27 deletions ansible/roles/rhck_kernel/tasks/oracle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,6 @@
until: rhck_installation_rpm is success
retries: 3
delay: 3

- name: configure grub for oracle 7
block:
- name: generate grub
command: grub2-mkconfig -o /boot/grub2/grub.cfg

- name: read grub.cfg
command: cat /boot/grub2/grub.cfg
register: grub_cfg

- name: read RHCK kernel
set_fact:
rhck_kernel: "{{
grub_cfg.stdout_lines |
reject('match', '^.*Unbreakable Enterprise Kernel.*$') |
select('match', '^menuentry') |
map('regex_replace', \"^menuentry '(.*?)' .*$\", '\\1') |
sort |
last
}}"

- name: set default kernel
command: grub2-set-default "{{ rhck_kernel }}"

when:
- ansible_distribution_major_version == '7'

- name: configure grub for oracle 8
block:
- name: install grubby
Expand Down
6 changes: 3 additions & 3 deletions images/ami/oracle-79.yaml → images/ami/oracle-89.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
build_name: "oracle-7"
build_name: "oracle-8.9"
packer_builder_type: "amazon"
python_path: ""
packer:
ami_filter_name: "OL7.9-x86_64-HVM-2023-01-05"
ami_filter_name: "OL8.9-x86_64-HVM-2024-02-02"
ami_filter_owners: "131827586825"
distribution: "Oracle"
distribution_version: "7.9"
distribution_version: "8.9"
source_ami: ""
ssh_username: "ec2-user"
root_device_name: "/dev/sda1"
Expand Down
2 changes: 1 addition & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var (
"redhat 8.6",
"redhat 8.8",
"sles 15",
"oracle 7.9",
"oracle 8.9",
"flatcar",
"ubuntu 18.04",
"ubuntu 20.04",
Expand Down
Loading