From 97d05e2275ba35c2a9e3860ed622d5364b314856 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Thu, 1 Jun 2023 10:50:22 -0400
Subject: [PATCH] ansible: Update package installations to support EL aarch64

A number of packages are in the epel-release or the develo
repositories.

Change-Id: I0ad4b2c9dea377c86bbaf00e7631fa223425af08
---
 automation/ansible/roles/babeltrace/tasks/main.yml |  1 +
 .../ansible/roles/binutils-gdb/vars/Rocky.yml      |  1 +
 automation/ansible/roles/common/tasks/main.yml     |  1 +
 .../ansible/roles/common/tasks/setup-RedHat.yml    | 14 ++++++++++++++
 4 files changed, 17 insertions(+)
 create mode 120000 automation/ansible/roles/binutils-gdb/vars/Rocky.yml

diff --git a/automation/ansible/roles/babeltrace/tasks/main.yml b/automation/ansible/roles/babeltrace/tasks/main.yml
index cd37dff..177603e 100644
--- a/automation/ansible/roles/babeltrace/tasks/main.yml
+++ b/automation/ansible/roles/babeltrace/tasks/main.yml
@@ -3,6 +3,7 @@
 - name: Include OS-specific variables.
   include_vars: "{{ item }}"
   with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
diff --git a/automation/ansible/roles/binutils-gdb/vars/Rocky.yml b/automation/ansible/roles/binutils-gdb/vars/Rocky.yml
new file mode 120000
index 0000000..f802000
--- /dev/null
+++ b/automation/ansible/roles/binutils-gdb/vars/Rocky.yml
@@ -0,0 +1 @@
+RedHat.yml
\ No newline at end of file
diff --git a/automation/ansible/roles/common/tasks/main.yml b/automation/ansible/roles/common/tasks/main.yml
index a8798c5..61ee1ee 100644
--- a/automation/ansible/roles/common/tasks/main.yml
+++ b/automation/ansible/roles/common/tasks/main.yml
@@ -3,6 +3,7 @@
 - name: Include OS-specific variables.
   include_vars: "{{ item }}"
   with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
diff --git a/automation/ansible/roles/common/tasks/setup-RedHat.yml b/automation/ansible/roles/common/tasks/setup-RedHat.yml
index 355eeca..d1e5816 100644
--- a/automation/ansible/roles/common/tasks/setup-RedHat.yml
+++ b/automation/ansible/roles/common/tasks/setup-RedHat.yml
@@ -1,4 +1,18 @@
 ---
+- name: Enable epel-release
+  # This provides some extra packages, eg. htop, python3-virtualenv
+  dnf:
+    name: epel-release
+
+- name: Enable rocky devel repository
+  yum_repository:
+    name: devel
+    description: "Rocky Linux $releasever - Devel"
+    mirrorlist: "https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Devel-$releasever"
+    enabled: true
+    gpgcheck: true
+  when: ansible_distribution == 'Rocky'
+
 - name: Ensure common packages are installed.
   dnf:
     name: "{{ common_packages }}"
-- 
2.34.1