Update role to version 2.2.2 to fix HA and fix changelog in spec
- Make the role wait for ha_cluster to finish configuration Resolves: RHEL-19202 - Fixes for general-meta tests CHANGELOG.md was missing in some places In legacy role, sed repalced unexpected strings at some places
This commit is contained in:
parent
97bf0b8e24
commit
887c27d61f
@ -14,8 +14,8 @@ BuildRequires: ansible-core >= 2.11.0
|
|||||||
Name: ansible-collection-microsoft-sql
|
Name: ansible-collection-microsoft-sql
|
||||||
Url: https://github.com/linux-system-roles/mssql
|
Url: https://github.com/linux-system-roles/mssql
|
||||||
Summary: The Ansible collection for Microsoft SQL Server management
|
Summary: The Ansible collection for Microsoft SQL Server management
|
||||||
Version: 2.2.1
|
Version: 2.2.2
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
|
|
||||||
@ -172,16 +172,18 @@ mkdir -p %{buildroot}%{ansible_roles_dir}
|
|||||||
# Copy role in legacy format and rename rolename in tests
|
# Copy role in legacy format and rename rolename in tests
|
||||||
cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}"
|
cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}"
|
||||||
find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \
|
find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \
|
||||||
sed -e "s/%{collection_namespace}.%{collection_name}.%{collection_rolename}/%{legacy_rolename}/g" \
|
sed -e "s/%{collection_namespace}\.%{collection_name}\.%{collection_rolename}/%{legacy_rolename}/g" \
|
||||||
-i {} \;
|
-i {} \;
|
||||||
|
|
||||||
# Copy README, COPYING, and LICENSE files to the corresponding directories
|
# Copy README, COPYING, CHANGELOG and LICENSE files to the corresponding directories
|
||||||
mkdir -p %{buildroot}%{_pkglicensedir}
|
mkdir -p %{buildroot}%{_pkglicensedir}
|
||||||
mkdir -p "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
mkdir -p "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
||||||
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \
|
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \
|
||||||
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
||||||
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \
|
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \
|
||||||
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
||||||
|
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/CHANGELOG.md" \
|
||||||
|
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
|
||||||
if [ -f "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" ]; then
|
if [ -f "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" ]; then
|
||||||
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" \
|
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" \
|
||||||
"%{buildroot}%{_pkglicensedir}/%{legacy_rolename}.COPYING"
|
"%{buildroot}%{_pkglicensedir}/%{legacy_rolename}.COPYING"
|
||||||
@ -216,6 +218,10 @@ ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collect
|
|||||||
ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.html \
|
ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.html \
|
||||||
%{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
|
%{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
|
||||||
|
|
||||||
|
# Link role CHANGELOG.md to /usr/share/doc/ansible-collection-microsoft-sql/collection/roles/server
|
||||||
|
ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/CHANGELOG.md \
|
||||||
|
%{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
|
||||||
|
|
||||||
# Step 4: Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
|
# Step 4: Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
|
||||||
%if %{with collection_artifact}
|
%if %{with collection_artifact}
|
||||||
pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
|
pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
|
||||||
@ -306,6 +312,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 6 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.2-1
|
||||||
|
- Update role to version 2.2.2 to fix HA
|
||||||
|
Resolves: RHEL-19202
|
||||||
|
- CHANGELOG.md was missing in some places
|
||||||
|
- In legacy role, sed repalced unexpected strings at some places
|
||||||
|
Resolves: RHEL-23456
|
||||||
|
|
||||||
* Wed Jan 31 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.1-2
|
* Wed Jan 31 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.1-2
|
||||||
- Use latest auto-maintenance for updates in lsr_role2collection.py
|
- Use latest auto-maintenance for updates in lsr_role2collection.py
|
||||||
- Remove with_html, instead use built-in .README.html
|
- Remove with_html, instead use built-in .README.html
|
||||||
|
Loading…
Reference in New Issue
Block a user