Related: RHEL-74075, use redhat.sap_install for *_sap_install_collection

This commit is contained in:
Than Ngo 2025-01-28 18:01:22 +01:00
parent d9a73c5e83
commit 723215b7c7
3 changed files with 11 additions and 5 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@
/redhat.sap_install-1.5.1.tar.gz
/redhat.sap_infrastructure-1.1.1.tar.gz
/redhat.sap_install-1.5.2.tar.gz
/auto-maintenance-e4e63cd408561b39e11d6285ab81f32a999719db.tar.gz

View File

@ -23,7 +23,7 @@
%global collection_dir_sap_install collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_install}
%global collection_dir_sap_infrastructure collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_infrastructure}
%global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
%global mainid e4e63cd408561b39e11d6285ab81f32a999719db
%global commit_id_sap_install %{collection_sap_install_version}
%global commit_id_sap_infrastructure %{collection_sap_infrastructure_version}
%global rolename1 sap_general_preconfigure
@ -45,7 +45,7 @@
Name: %{package_name}
Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
Version: 3.8.1
Version: 3.8.2
Release: 1%{?dist}
License: GPL-3.0-or-later
Url: https://github.com/redhat-sap/community.sap_install
@ -161,7 +161,9 @@ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role
--new-role "$new_role"
done
# update galaxy.yml
cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
# update README.md
cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.md .collections/ansible_collections/%{collection_namespace}/%{collection_name}
@ -191,7 +193,7 @@ for role in %{rolename_sap_install} ; do
echo "%dir %{_pkgdocdir}/$role" >> files_section.txt
done
# install sap_infrastructure
# install sap_infrastructure roles
for role in %{rolename_sap_infrastructure} ; do
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/$role
cp -pR %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/roles/$role $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
@ -235,6 +237,9 @@ popd
%endif
%changelog
* Tue Jan 28 2025 Than Ngo <than@redhat.com> - 3.8.2-1
- Related: RHEL-74075, use redhat.sap_install for *_sap_install_collection
* Tue Jan 28 2025 Than Ngo <than@redhat.com> - 3.8.1-1
- Related: RHEL-74075, update redhat.sap_install to 1.5.2

View File

@ -1,3 +1,3 @@
SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c
SHA512 (redhat.sap_infrastructure-1.1.1.tar.gz) = 88ad3be52aec71b5fddf900071911e04cbda1b8f225a86c4fea91188b259d6bded1b3423a8b4278123dd1bcf5efad47be937266534332c81abe50f2f6bb18964
SHA512 (redhat.sap_install-1.5.2.tar.gz) = ce1e25f4deb0169c0b541825bc6e58f6d56fe5fc69f8399979aa27c1d2e6b64efb7c9ca752ceed3c744aedb82d12cb8ccd415f5ae6d1e2690e047ed81cfefba8
SHA512 (redhat.sap_install-1.5.2.tar.gz) = 2bf85c36745bae016c9b3e3f88f47baa834846b7bda3fcd5f036529dba70b56f21731953417c6f4fb72521f5bf614c87c25faf444429477fc0b6fd0b5ce617ad
SHA512 (auto-maintenance-e4e63cd408561b39e11d6285ab81f32a999719db.tar.gz) = 23e6774d2aa88e7a694f81c9f25d9e7a6a9d14abc4a2d5b15e4a4a0b078ba966d7ae396ca91d8ae92b0116f0b099e77aa7f4cc0c4d60a15a2c6bbfd24486ab86