rpms/rhel-system-roles-sap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: RHEL-34806, rebase sap roles to version 1.3.7

Browse Source
This commit is contained in:
Than Ngo 2024-05-14 13:51:17 +02:00
parent 079f2de863
commit 704e8b4122
4 changed files with 20 additions and 37595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@
/community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz /community.sap_install-60f5f40497d54c46b0bd3f79ef1fef4ada148119.tar.gz
/redhat.sap_install-1.3.4.tar.gz /redhat.sap_install-1.3.4.tar.gz
/redhat.sap_install-1.3.5.tar.gz /redhat.sap_install-1.3.5.tar.gz
/redhat.sap_install-1.3.7.tar.gz

37585
redhat.sap_install-1.3.5-collections-files-324bfb8bab50d2baa1c4aacdb59e4e5c9e2ba74f.patch
View File

File diff suppressed because it is too large Load Diff

27
rhel-system-roles-sap.spec
View File

@ -24,8 +24,9 @@
# collection_version has to be increased by every rebuild # collection_version has to be increased by every rebuild
# otherwise, it cannot be uploaded to Automation Hub and Galaxy # otherwise, it cannot be uploaded to Automation Hub and Galaxy
# due to version conflict # due to version conflict
%define collection_version 1.3.5 %define collection_version 1.3.7
%global collection_dir collections/ansible_collections/redhat/sap_install
%global mainid e2a233f5a0cb68363798bf014b16552cca681bd0 %global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
%global commit_id_sap_install %{collection_version} %global commit_id_sap_install %{collection_version}
%global rolename1 sap_general_preconfigure %global rolename1 sap_general_preconfigure
@ -44,21 +45,18 @@
Name: %{package_name} Name: %{package_name}
Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
Version: 3.6.0 Version: 3.7.0
Release: 4%{?dist} Release: 1%{?dist}
License: GPL-3.0-or-later License: GPL-3.0-or-later
Url: https://github.com/redhat-sap/community.sap_install Url: https://github.com/redhat-sap/community.sap_install
Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
Source1: https://github.com/redhat-sap/redhat.sap_install/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz Source1: https://github.com/redhat-sap/redhat.sap_install/archive/%{commit_id_sap_install}/%{github_repo_sap_install}-%{commit_id_sap_install}.tar.gz
# add collection files
Patch1: redhat.sap_install-1.3.5-collections-files-324bfb8bab50d2baa1c4aacdb59e4e5c9e2ba74f.patch
# add tests files # add tests files
Patch2: redhat.sap_install-1.3.4-add_tests.patch Patch1: redhat.sap_install-1.3.4-add_tests.patch
# add tools files # add tools files
Patch3: redhat.sap_install-1.3.4-add_tools.patch Patch2: redhat.sap_install-1.3.4-add_tools.patch
BuildArch: noarch BuildArch: noarch
@ -75,6 +73,8 @@ BuildRequires: highlight
%endif %endif
%endif %endif
BuildRequires: tar
# Requirements for galaxy_transform.py # Requirements for galaxy_transform.py
BuildRequires: python3 BuildRequires: python3
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
@ -133,7 +133,13 @@ Collection artifact for %{name}. This package contains %{collection_namespace}-%
pushd %{github_repo_sap_install}-%{commit_id_sap_install}/ pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
%patch -P1 -p1 %patch -P1 -p1
%patch -P2 -p1 %patch -P2 -p1
%patch -P3 -p1
# unpack collection tar file
%if %{without collection}
mkdir -p %{collection_dir}
tar zxf redhat-sap_install-%{collection_version}.tar.gz -C %{collection_dir}
%endif
# workaround for md2html error # workaround for md2html error
sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md
popd popd
@ -247,6 +253,9 @@ popd
%endif %endif
%changelog %changelog
* Tue May 14 2024 Than Ngo <than@redhat.com> - 3.7.0-1
- Resolves: RHEL-34806, rebase sap roles to version 1.3.7
* Mon Feb 05 2024 Than Ngo <than@redhat.com> - 3.6.0-4 * Mon Feb 05 2024 Than Ngo <than@redhat.com> - 3.6.0-4
- sap_hypervisor_node_preconfigure: fix for role name and path for included tasks - sap_hypervisor_node_preconfigure: fix for role name and path for included tasks
- update collection files - update collection files

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c SHA512 (auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz) = 3d5c784e668605eb8b7862227b456da05ff5dedf84411131a27118b501b6a9bbe8894c4f29e6de4230fe534ef6b2de4653c56a904857d9eb11b452d31aed143c
SHA512 (redhat.sap_install-1.3.5.tar.gz) = 7c15aff5d0fa2c21200d73d901bf659175a952de4de0ae2f7cd6909d75134f769d9ac466ce2a39e2bfafc7177fb55f484bb8232d8095f25b5deb6086c5ef1287 SHA512 (redhat.sap_install-1.3.7.tar.gz) = 5897825f962f4ce8575867c465ce081fc4f6a87e764172f9059722cabaf71452405492a31373f04673a7724878bc750139069bdbaf45a590822947034bc23aa4