mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 14:22:46 +00:00
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
This commit is contained in:
@@ -7,4 +7,3 @@ destructive
|
|||||||
needs/target/setup_epel
|
needs/target/setup_epel
|
||||||
skip/macos
|
skip/macos
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
skip/rhel # FIXME
|
|
||||||
|
|||||||
@@ -7,3 +7,4 @@ process_root: /opt/httpd_echo
|
|||||||
process_file: "{{ process_root }}/httpd_echo.py"
|
process_file: "{{ process_root }}/httpd_echo.py"
|
||||||
process_venv: "{{ process_root }}/venv"
|
process_venv: "{{ process_root }}/venv"
|
||||||
process_run_cmd: "{{ process_venv }}/bin/python {{ process_file }}"
|
process_run_cmd: "{{ process_venv }}/bin/python {{ process_file }}"
|
||||||
|
virtualenv_command: virtualenv
|
||||||
|
|||||||
@@ -9,12 +9,9 @@
|
|||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: Install EPEL repository (RHEL only)
|
- name: Install EPEL repository (only effective in RHEL)
|
||||||
include_role:
|
include_role:
|
||||||
name: setup_epel
|
name: setup_epel
|
||||||
when:
|
|
||||||
- ansible_facts.distribution in ['RedHat', 'CentOS']
|
|
||||||
- ansible_facts.distribution_major_version is version('9', '<')
|
|
||||||
|
|
||||||
- name: create required directories
|
- name: create required directories
|
||||||
become: true
|
become: true
|
||||||
@@ -67,9 +64,10 @@
|
|||||||
pip:
|
pip:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
virtualenv: "{{ process_venv }}"
|
virtualenv: "{{ process_venv }}"
|
||||||
|
virtualenv_command: "{{ virtualenv_command }}"
|
||||||
extra_args: "-c {{ remote_constraints }}"
|
extra_args: "-c {{ remote_constraints }}"
|
||||||
loop:
|
loop:
|
||||||
- setuptools==44
|
- setuptools
|
||||||
- python-daemon
|
- python-daemon
|
||||||
|
|
||||||
- name: restart monit
|
- name: restart monit
|
||||||
|
|||||||
@@ -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"
|
|
||||||
@@ -4,3 +4,4 @@
|
|||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
monitrc: "/etc/monitrc"
|
monitrc: "/etc/monitrc"
|
||||||
|
virtualenv_command: python3 -m venv
|
||||||
|
|||||||
@@ -10,16 +10,7 @@
|
|||||||
|
|
||||||
- name: Install EPEL
|
- name: Install EPEL
|
||||||
yum:
|
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
|
disable_gpg_check: true
|
||||||
when:
|
when:
|
||||||
- ansible_facts.distribution in ['RedHat', 'CentOS']
|
- 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'
|
|
||||||
|
|||||||
Reference in New Issue
Block a user