From 887c27d61f2b3d8f510711d9df74abb1694ef7f5 Mon Sep 17 00:00:00 2001 From: Sergei Petrosian Date: Tue, 6 Feb 2024 12:47:32 +0100 Subject: [PATCH] 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 --- ansible-collection-microsoft-sql.spec | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ansible-collection-microsoft-sql.spec b/ansible-collection-microsoft-sql.spec index 26c848c..fc073b0 100644 --- a/ansible-collection-microsoft-sql.spec +++ b/ansible-collection-microsoft-sql.spec @@ -14,8 +14,8 @@ BuildRequires: ansible-core >= 2.11.0 Name: ansible-collection-microsoft-sql Url: https://github.com/linux-system-roles/mssql Summary: The Ansible collection for Microsoft SQL Server management -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: MIT @@ -172,16 +172,18 @@ mkdir -p %{buildroot}%{ansible_roles_dir} # Copy role in legacy format and rename rolename in tests cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}" 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 {} \; -# 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}%{_pkgdocdir}/%{legacy_rolename}" ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \ "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}" ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \ "%{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 ln -sr "%{buildroot}%{ansible_roles_dir}/%{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 \ %{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 %if %{with collection_artifact} pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ @@ -306,6 +312,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Tue Feb 6 2024 Sergei Petrosian - 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 - 2.2.1-2 - Use latest auto-maintenance for updates in lsr_role2collection.py - Remove with_html, instead use built-in .README.html