From f4e5fc09d7e9982d472980690f0b1a2081b08fc9 Mon Sep 17 00:00:00 2001
From: Alexei Znamensky <103110+russoz@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:17:38 +1300
Subject: [PATCH] monit: re-enable tests in RHEL (#11690)

* re-enable monit tests in rhel

* enable EPEL for RHEL<11

* rollback EPEL setup, skip only specific versions

* remove skip entirely

* change download URL in setup_epel, adjusted code to use it

* claude tries to install virtualenv, round 1

* claude tries python3 -m venv instead

* remove outdated centos6 file
---
 tests/integration/targets/monit/aliases             |  1 -
 tests/integration/targets/monit/defaults/main.yml   |  1 +
 tests/integration/targets/monit/tasks/main.yml      |  8 +++-----
 tests/integration/targets/monit/vars/CentOS-6.yml   |  6 ------
 tests/integration/targets/monit/vars/RedHat.yml     |  1 +
 tests/integration/targets/setup_epel/tasks/main.yml | 11 +----------
 6 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 tests/integration/targets/monit/vars/CentOS-6.yml

diff --git a/tests/integration/targets/monit/aliases b/tests/integration/targets/monit/aliases
index 62ef1f7347..d90b249339 100644
--- a/tests/integration/targets/monit/aliases
+++ b/tests/integration/targets/monit/aliases
@@ -7,4 +7,3 @@ destructive
 needs/target/setup_epel
 skip/macos
 skip/freebsd
-skip/rhel  # FIXME
diff --git a/tests/integration/targets/monit/defaults/main.yml b/tests/integration/targets/monit/defaults/main.yml
index ec064643ce..ed0b33a98e 100644
--- a/tests/integration/targets/monit/defaults/main.yml
+++ b/tests/integration/targets/monit/defaults/main.yml
@@ -7,3 +7,4 @@ process_root: /opt/httpd_echo
 process_file: "{{ process_root }}/httpd_echo.py"
 process_venv: "{{ process_root }}/venv"
 process_run_cmd: "{{ process_venv }}/bin/python {{ process_file }}"
+virtualenv_command: virtualenv
diff --git a/tests/integration/targets/monit/tasks/main.yml b/tests/integration/targets/monit/tasks/main.yml
index aba17646a0..d0dcca74f8 100644
--- a/tests/integration/targets/monit/tasks/main.yml
+++ b/tests/integration/targets/monit/tasks/main.yml
@@ -9,12 +9,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-    - name: Install EPEL repository (RHEL only)
+    - name: Install EPEL repository (only effective in RHEL)
       include_role:
         name: setup_epel
-      when:
-        - ansible_facts.distribution in ['RedHat', 'CentOS']
-        - ansible_facts.distribution_major_version is version('9', '<')
 
     - name: create required directories
       become: true
@@ -67,9 +64,10 @@
       pip:
         name: "{{ item }}"
         virtualenv: "{{ process_venv }}"
+        virtualenv_command: "{{ virtualenv_command }}"
         extra_args: "-c {{ remote_constraints }}"
       loop:
-        - setuptools==44
+        - setuptools
         - python-daemon
 
     - name: restart monit
diff --git a/tests/integration/targets/monit/vars/CentOS-6.yml b/tests/integration/targets/monit/vars/CentOS-6.yml
deleted file mode 100644
index 9ff9c26410..0000000000
--- a/tests/integration/targets/monit/vars/CentOS-6.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# Copyright (c) Ansible Project
-# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-monitrc: "/etc/monit.conf"
diff --git a/tests/integration/targets/monit/vars/RedHat.yml b/tests/integration/targets/monit/vars/RedHat.yml
index 773c9d985a..c3a125dd9e 100644
--- a/tests/integration/targets/monit/vars/RedHat.yml
+++ b/tests/integration/targets/monit/vars/RedHat.yml
@@ -4,3 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 monitrc: "/etc/monitrc"
+virtualenv_command: python3 -m venv
diff --git a/tests/integration/targets/setup_epel/tasks/main.yml b/tests/integration/targets/setup_epel/tasks/main.yml
index 68b85a5fd6..f585b67dcf 100644
--- a/tests/integration/targets/setup_epel/tasks/main.yml
+++ b/tests/integration/targets/setup_epel/tasks/main.yml
@@ -10,16 +10,7 @@
 
 - name: Install EPEL
   yum:
-    name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_facts.distribution_major_version }}.noarch.rpm
+    name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_facts.distribution_major_version }}.noarch.rpm
     disable_gpg_check: true
   when:
     - ansible_facts.distribution in ['RedHat', 'CentOS']
-    - ansible_facts.distribution_major_version == '6'
-
-- name: Install EPEL
-  yum:
-    name: https://ci-files.testing.ansible.com/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_facts.distribution_major_version }}.noarch.rpm
-    disable_gpg_check: true
-  when:
-    - ansible_facts.distribution in ['RedHat', 'CentOS']
-    - ansible_facts.distribution_major_version != '6'