feat: adds oracle 8.9 support (#1165)

mesosphere · Sep 12, 2024 · 4926074 · 4926074
1 parent 2255f9b
commit 4926074
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 56 deletions.
diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
@@ -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"

diff --git a/.github/workflows/release-ami.yaml b/.github/workflows/release-ami.yaml
@@ -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"

diff --git a/ansible/roles/repo/files/etc/yum.repos.d/epel-7.repo b/ansible/roles/repo/files/etc/yum.repos.d/epel-7.repo
diff --git a/ansible/roles/repo/tasks/redhat.yaml b/ansible/roles/repo/tasks/redhat.yaml
@@ -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:

diff --git a/ansible/roles/rhck_kernel/tasks/oracle.yaml b/ansible/roles/rhck_kernel/tasks/oracle.yaml
@@ -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

diff --git a/images/ami/oracle-79.yaml → images/ami/oracle-89.yaml b/images/ami/oracle-79.yaml → images/ami/oracle-89.yaml
@@ -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"

diff --git a/magefile.go b/magefile.go
@@ -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",