Don't include the codereadyrepo role if we're using a custom yum repofile

Commit Message

Scott Mayhew March 5, 2025, 12:57 a.m. UTC

If we're using a custom yum repofile, there's no guarantee the CRB repo
follows the expected naming convention or that a CRB repo even exists
for our setup.

Signed-off-by: Scott Mayhew <[e-mail]>
---
 playbooks/roles/codereadyrepo/tasks/main.yml                | 5 -----
 playbooks/roles/fstests/tasks/install-deps/redhat/main.yml  | 1 +
 playbooks/roles/ltp/tasks/main.yml                          | 1 +
 playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml    | 3 ++-
 playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/playbooks/roles/codereadyrepo/tasks/main.yml b/playbooks/roles/codereadyrepo/tasks/main.yml
index 1b8bad0..45e6f7a 100644
--- a/playbooks/roles/codereadyrepo/tasks/main.yml
+++ b/playbooks/roles/codereadyrepo/tasks/main.yml
@@ -4,7 +4,6 @@ 
     codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms"
   when:
     - ansible_distribution == 'RedHat'
-    - not devconfig_custom_yum_repofile
     - kdevops_enable_guestfs
 
 - name: Select the Oracle Linux CodeReady Builder repo
@@ -12,14 +11,12 @@ 
     codeready_repo: "ol9_codeready_builder"
   when:
     - ansible_distribution == 'OracleLinux'
-    - not devconfig_custom_yum_repofile
 
 - name: Select the CentOS CodeReady Builder repo
   ansible.builtin.set_fact:
     codeready_repo: "crb"
   when:
     - ansible_distribution == 'CentOS'
-    - not devconfig_custom_yum_repofile
     - kdevops_enable_guestfs
 
 - name: Select the AWS RHEL CodeReady Builder repo
@@ -27,7 +24,6 @@ 
     codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-rhui-rpms"
   when:
     - ansible_distribution == 'RedHat'
-    - not devconfig_custom_yum_repofile
     - kdevops_enable_terraform
     - kdevops_terraform_provider == "aws"
 
@@ -36,7 +32,6 @@ 
     codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rhui-rpms"
   when:
     - ansible_distribution == 'RedHat'
-    - not devconfig_custom_yum_repofile
     - kdevops_enable_terraform
     - kdevops_terraform_provider == "azure"
 
diff --git a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml
index 52b4bce..c8df399 100644
--- a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml
@@ -4,6 +4,7 @@ 
     name: codereadyrepo
   when:
     - ansible_distribution != "Fedora"
+    - not devconfig_custom_yum_repofile
 
 - name: Enable installation of packages from EPEL
   ansible.builtin.include_role:
diff --git a/playbooks/roles/ltp/tasks/main.yml b/playbooks/roles/ltp/tasks/main.yml
index b15f87d..f6cf97a 100644
--- a/playbooks/roles/ltp/tasks/main.yml
+++ b/playbooks/roles/ltp/tasks/main.yml
@@ -48,6 +48,7 @@ 
   when:
     - ansible_os_family == "RedHat"
     - ansible_distribution != "Fedora"
+    - not devconfig_custom_yum_repofile
 
 - name: Install dependencies for ltp
   tags: ['build', 'ltp']
diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
index b98ff67..2375e93 100644
--- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
@@ -3,7 +3,8 @@ 
   ansible.builtin.include_role:
     name: codereadyrepo
   when:
-    ansible_distribution != "Fedora"
+    - ansible_distribution != "Fedora"
+    - not devconfig_custom_yum_repofile
 
 - name: Install build dependencies for pynfs
   become: yes
diff --git a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml
index d5021e0..47832b2 100644
--- a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml
@@ -4,6 +4,7 @@ 
     name: codereadyrepo
   when:
     - ansible_distribution != "Fedora"
+    - not devconfig_custom_yum_repofile
 
 - name: Enable installation of packages from EPEL
   ansible.builtin.include_role: