|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Name: ansible-pcp
|
|
|
|
|
Version: 2.2.2
|
|
|
|
|
Release: 2%{?dist}
|
|
|
|
|
Version: 2.2.5
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Summary: Ansible Metric collection for Performance Co-Pilot
|
|
|
|
|
License: MIT
|
|
|
|
|
URL: https://github.com/performancecopilot/ansible-pcp
|
|
|
|
|
@ -15,39 +15,39 @@ BuildArch: noarch
|
|
|
|
|
%global collection_name metrics
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} >= 8
|
|
|
|
|
Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# NOTE: Even though ansible-core is in 8.6, it is only available
|
|
|
|
|
# at *runtime*, not at *buildtime* - so we can't have
|
|
|
|
|
# ansible-core as a build_dep on RHEL8
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} >= 9
|
|
|
|
|
%global have_ansible 0
|
|
|
|
|
%bcond_without ansible
|
|
|
|
|
%global ansible_build_dep ansible-core >= 2.11.0
|
|
|
|
|
%else
|
|
|
|
|
%if 0%{?rhel} && ! 0%{?epel}
|
|
|
|
|
%global have_ansible 1
|
|
|
|
|
%bcond_with ansible
|
|
|
|
|
%else
|
|
|
|
|
%global have_ansible 0
|
|
|
|
|
%bcond_without ansible
|
|
|
|
|
%global ansible_build_dep ansible >= 2.9.10
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{have_ansible}
|
|
|
|
|
BuildRequires: %{ansible_build_dep}
|
|
|
|
|
# package has been removed from RHEL9
|
|
|
|
|
%if 0%{?rhel} >= 9
|
|
|
|
|
%global have_ansible_lint 0
|
|
|
|
|
%else
|
|
|
|
|
%global have_ansible_lint 1
|
|
|
|
|
%endif
|
|
|
|
|
%else
|
|
|
|
|
%global have_ansible_lint 0
|
|
|
|
|
%global ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}
|
|
|
|
|
%if 0%{?rhel} >= 8
|
|
|
|
|
Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{have_ansible_lint}
|
|
|
|
|
%if %{with ansible}
|
|
|
|
|
BuildRequires: %{ansible_build_dep}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
|
|
|
|
|
|
|
|
|
|
# package has been removed from RHEL8
|
|
|
|
|
%if 0%{?rhel} >= 8
|
|
|
|
|
%bcond_with ansible_lint
|
|
|
|
|
%else
|
|
|
|
|
%bcond_without ansible_lint
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with ansible_lint}
|
|
|
|
|
BuildRequires: python3-ansible-lint
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -105,14 +105,14 @@ find . -name \*.yml -o -name \*.md | while read file; do
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if %{have_ansible}
|
|
|
|
|
%if %{with ansible}
|
|
|
|
|
%ansible_collection_build
|
|
|
|
|
%else
|
|
|
|
|
tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz .
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%if %{have_ansible}
|
|
|
|
|
%if %{with ansible}
|
|
|
|
|
%ansible_collection_install
|
|
|
|
|
%else
|
|
|
|
|
mkdir -p %{buildroot}%{ansible_collection_files}/%{collection_name}
|
|
|
|
|
@ -123,7 +123,7 @@ tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz
|
|
|
|
|
%check
|
|
|
|
|
mv yamllint.yml .yamllint.yml
|
|
|
|
|
mv yamllint_defaults.yml .yamllint_defaults.yml
|
|
|
|
|
%if %{have_ansible_lint}
|
|
|
|
|
%if %{with ansible_lint}
|
|
|
|
|
ansible-lint `find roles -name \*.yml`
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -133,6 +133,10 @@ ansible-lint `find roles -name \*.yml`
|
|
|
|
|
%{ansible_collection_files}
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Apr 21 2022 Nathan Scott <nathans@redhat.com> 2.2.5-1
|
|
|
|
|
- Switch to using bcond spec file mechanisms
|
|
|
|
|
- Latest upstream release (BZ 2059463)
|
|
|
|
|
|
|
|
|
|
* Tue Feb 15 2022 Nathan Scott <nathans@redhat.com> 2.2.2-2
|
|
|
|
|
- RHEL8.6+, RHEL9+, Fedora - add "ansible-core or ansible" dep
|
|
|
|
|
|
|
|
|
|
|