From 038a00810a3754999fc37ec39f426ae7674a397b Mon Sep 17 00:00:00 2001
From: jgoutin <jgoutin@accelize.com>
Date: Tue, 29 Jun 2021 18:36:31 +0200
Subject: [PATCH] Add missing repositories for CentOS 8 and RHEL7/8.

---
 azure-pipelines.yml           |  5 +--
 molecule/default/molecule.yml |  5 +++
 tasks/aws.yml                 |  1 +
 tasks/main.yml                | 59 ++++++++++++++++++++++++++++++++++-
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 17b6d45..1880ec6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -95,9 +95,6 @@ jobs:
           tagPattern: '[0-9]+\.[0-9]+\.[0-9]+'
           isPreRelease: contains($(libraryVersion.version), '-')
           releaseNotesSource: inline
-          releaseNotesInline: |
-            Release of version $(libraryVersion.version).
-
-            Role Available on Ansible galaxy.
+          releaseNotesInline: Role Available on Ansible galaxy.
           changeLogCompareToRelease: lastFullRelease
           changeLogType: commitBased
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index e8ca773..aaef091 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -75,6 +75,11 @@ platforms:
     groups:
       - xrt_2018_2
 
+  - name: centos_8-2021.1
+    image: centos:8
+    groups:
+      - xrt_2021_1
+
   - name: centos_7-2020.1
     image: centos:7
     groups:
diff --git a/tasks/aws.yml b/tasks/aws.yml
index b71738c..2d479a9 100644
--- a/tasks/aws.yml
+++ b/tasks/aws.yml
@@ -71,6 +71,7 @@
     name: "{{ xrt_tmp.path }}/{{ aws_package }}"
     state: present
     install_weak_deps: false
+    disable_gpg_check: true
   retries: 10
   delay: 1
   register: _xrt_aws_rpm
diff --git a/tasks/main.yml b/tasks/main.yml
index 5ca276f..094b2f0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -113,9 +113,11 @@
 
 - name: Ensure EPEL repository is installed
   yum:
-    name: epel-release
+    name: "https://dl.fedoraproject.org/pub/epel/\
+           epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
     state: present
     install_weak_deps: false
+    disable_gpg_check: true
   retries: 10
   delay: 1
   register: _epel
@@ -124,6 +126,60 @@
     - xilinx_xrt_install | bool
     - not xbutil.stat.exists
     - ansible_os_family == 'RedHat'
+    - ansible_distribution_major_version in ("7", "8")
+
+- name: Ensure RHEL optional RPMs repository is enabled
+  command:
+    cmd: subscription-manager repos --enable "rhel-7-server-optional-rpms"
+  args:
+    warn: false
+  changed_when: false
+  when:
+    - ansible_distribution == "Red Hat Enterprise Linux"
+    - ansible_distribution_major_version == "7"
+
+- name: Ensure CodeReady Linux Builder repository is enabled
+  command:
+    cmd: subscription-manager repos --enable "codeready-builder-for-rhel-8-x86_64-rpms"
+  args:
+    warn: false
+  changed_when: false
+  when:
+    - ansible_distribution == "Red Hat Enterprise Linux"
+    - ansible_distribution_major_version == "8"
+
+- name: Ensure DNF core plugins are installed
+  dnf:
+    state: present
+    name: python3-dnf-plugins-core
+    install_weak_deps: false
+  retries: 10
+  delay: 1
+  register: _dnf_plugins
+  until: _dnf_plugins is successful
+  when:
+    - ansible_distribution == "CentOS"
+    - ansible_distribution_major_version == "8"
+
+- name: Ensure Powertools repository is enabled
+  command:
+    cmd: dnf config-manager --set-enabled powertools
+  args:
+    warn: false
+  changed_when: false
+  when:
+    - ansible_distribution == "CentOS"
+    - ansible_distribution_major_version == "8"
+
+- name: Ensure AppStream repository is enabled
+  command:
+    cmd: dnf config-manager --set-enabled appstream
+  args:
+    warn: false
+  changed_when: false
+  when:
+    - ansible_distribution == "CentOS"
+    - ansible_distribution_major_version == "8"
 
 - name: Ensure Kernel headers RPM are installed
   yum:
@@ -149,6 +205,7 @@
     name: "{{ xrt_tmp.path }}/{{ xrt_package }}"
     state: present
     install_weak_deps: false
+    disable_gpg_check: true
   retries: 10
   delay: 1
   register: _xrt_rpm