From: Scott Mayhew <smayhew@redhat.com>
To: kdevops@lists.linux.dev
Subject: [PATCH] Don't include the codereadyrepo role if we're using a custom yum repofile
Date: Tue, 4 Mar 2025 19:57:45 -0500 [thread overview]
Message-ID: <20250305005755.697599-2-smayhew@redhat.com> (raw)
In-Reply-To: <20250305005755.697599-1-smayhew@redhat.com>
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 <smayhew@redhat.com>
---
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(-)
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:
--
2.48.1
next prev parent reply other threads:[~2025-03-05 0:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-05 0:57 [PATCH 0/9] tweak results organization and reporting Scott Mayhew
2025-03-05 0:57 ` Scott Mayhew [this message]
2025-03-05 0:57 ` [PATCH 1/9] pynfs: add last-run directory and last-kernel.txt to the results Scott Mayhew
2025-03-05 0:57 ` [PATCH 2/9] nfstest: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 3/9] gitr: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 4/9] ltp: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 5/9] fstests: add makefile target to show test results Scott Mayhew
2025-03-05 0:57 ` [PATCH 6/9] pynfs: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 7/9] nfstest: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 8/9] gitr: " Scott Mayhew
2025-03-05 0:57 ` [PATCH 9/9] ltp: " Scott Mayhew
2025-03-05 0:57 ` [PATCH] Don't include the codereadyrepo role if we're using a custom yum repofile Scott Mayhew
2025-03-05 1:11 ` [PATCH 0/9] tweak results organization and reporting Scott Mayhew
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250305005755.697599-2-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox