.gitignore

@@ -1,2 +1,4 @@
-SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-SOURCES/redhat.sap_install-1.3.5.tar.gz
+SOURCES/auto-maintenance-1.108.0.tar.gz
+SOURCES/build-tools-1.7.1.tar.gz
+SOURCES/redhat.sap_infrastructure-1.1.3.tar.gz
+SOURCES/redhat.sap_install-1.7.1.tar.gz

.rhel-system-roles-sap.metadata

@@ -1,2 +1,4 @@
-584f8d1681adf13cb7af256a7b38d94ca80dcab2 SOURCES/auto-maintenance-e2a233f5a0cb68363798bf014b16552cca681bd0.tar.gz
-835376d0e4799989e9d4deb21ac7e1d335c941de SOURCES/redhat.sap_install-1.3.5.tar.gz
+0436058a402cd8dd8fc938d2131d9c4434806c4a SOURCES/auto-maintenance-1.108.0.tar.gz
+a4d4d1f34789ec2cbf2483f56e41b4f2a36ff251 SOURCES/build-tools-1.7.1.tar.gz
+1e16ae3766824f1d78afd206a0ad3b00f4dec001 SOURCES/redhat.sap_infrastructure-1.1.3.tar.gz
+8c4e35802f36361870cfee2c7ee6033942ea00f1 SOURCES/redhat.sap_install-1.7.1.tar.gz

SOURCES/redhat.sap_install-1.3.4-add_tools.patch

@@ -1,128 +0,0 @@
-commit 83db825f7f30445408efa6061631d8dd0590e891
-Author: Than Ngo <than@redhat.com>
-Date:   Thu Jan 25 16:17:21 2024 +0100
-
-    add missing tools folders
-    
-    Signed-off-by: Than Ngo <than@redhat.com>
-
-diff --git a/roles/sap_general_preconfigure/tools/beautify-assert-output.sh b/roles/sap_general_preconfigure/tools/beautify-assert-output.sh
-new file mode 100755
-index 0000000..f48087c
---- /dev/null
-+++ b/roles/sap_general_preconfigure/tools/beautify-assert-output.sh
-@@ -0,0 +1,34 @@
-+#!/bin/bash
-+
-+# default font color: Light Cyan, which should be readable on both bright and dark background
-+__FONT_COLOR=36m
-+
-+if [[ ${1}. == "font_light_gray". ]]; then
-+   __FONT_COLOR=37m
-+elif [[ ${1}. == "font_no_color". ]]; then
-+   __FONT_COLOR=30m
-+fi
-+
-+if [[ ${2}. == "reset." ]]; then
-+   awk 'BEGIN{printf ("\033['${__FONT_COLOR}'Resetting font color\n")}'
-+   exit
-+fi
-+
-+awk '{sub ("    \"msg\": ", "")}
-+  /TASK/{task_line=$0}
-+  /fatal:/{fatal_line=$0; nfatal[host]++}
-+  /...ignoring/{nfatal[host]--; if (nfatal[host]<0) nfatal[host]=0}
-+  /^[a-z]/&&/: \[/{gsub ("\\[", ""); gsub ("]", ""); gsub (":", ""); host=$2}
-+  /SAP note/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  /FAIL:/{nfail[host]++; print "\033[31m[" host"] "$0}
-+  /WARN:/{nwarn[host]++; print "\033[33m[" host"] "$0}
-+  /PASS:/{npass[host]++; print "\033[32m[" host"] "$0}
-+  /INFO:/{print "\033[34m[" host"] "$0}
-+  /changed/&&/unreachable/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  END{print ("---"); for (var in npass) {printf ("[%s] ", var); if (nfatal[var]>0) {
-+        printf ("\033[31mFATAL ERROR!!! Playbook might have been aborted!!!\033['${__FONT_COLOR}' Last TASK and fatal output:\n"); print task_line, fatal_line
-+        exit 199
-+     }
-+     else printf ("\033[31mFAIL: %d  \033[33mWARN: %d  \033[32mPASS: %d\033['${__FONT_COLOR}'\n", nfail[var], nwarn[var], npass[var])}
-+     if (nfail[var] != 0) exit (nfail[var])
-+  }'
-diff --git a/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh b/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh
-new file mode 100755
-index 0000000..f48087c
---- /dev/null
-+++ b/roles/sap_hana_preconfigure/tools/beautify-assert-output.sh
-@@ -0,0 +1,34 @@
-+#!/bin/bash
-+
-+# default font color: Light Cyan, which should be readable on both bright and dark background
-+__FONT_COLOR=36m
-+
-+if [[ ${1}. == "font_light_gray". ]]; then
-+   __FONT_COLOR=37m
-+elif [[ ${1}. == "font_no_color". ]]; then
-+   __FONT_COLOR=30m
-+fi
-+
-+if [[ ${2}. == "reset." ]]; then
-+   awk 'BEGIN{printf ("\033['${__FONT_COLOR}'Resetting font color\n")}'
-+   exit
-+fi
-+
-+awk '{sub ("    \"msg\": ", "")}
-+  /TASK/{task_line=$0}
-+  /fatal:/{fatal_line=$0; nfatal[host]++}
-+  /...ignoring/{nfatal[host]--; if (nfatal[host]<0) nfatal[host]=0}
-+  /^[a-z]/&&/: \[/{gsub ("\\[", ""); gsub ("]", ""); gsub (":", ""); host=$2}
-+  /SAP note/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  /FAIL:/{nfail[host]++; print "\033[31m[" host"] "$0}
-+  /WARN:/{nwarn[host]++; print "\033[33m[" host"] "$0}
-+  /PASS:/{npass[host]++; print "\033[32m[" host"] "$0}
-+  /INFO:/{print "\033[34m[" host"] "$0}
-+  /changed/&&/unreachable/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  END{print ("---"); for (var in npass) {printf ("[%s] ", var); if (nfatal[var]>0) {
-+        printf ("\033[31mFATAL ERROR!!! Playbook might have been aborted!!!\033['${__FONT_COLOR}' Last TASK and fatal output:\n"); print task_line, fatal_line
-+        exit 199
-+     }
-+     else printf ("\033[31mFAIL: %d  \033[33mWARN: %d  \033[32mPASS: %d\033['${__FONT_COLOR}'\n", nfail[var], nwarn[var], npass[var])}
-+     if (nfail[var] != 0) exit (nfail[var])
-+  }'
-diff --git a/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh b/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh
-new file mode 100755
-index 0000000..f48087c
---- /dev/null
-+++ b/roles/sap_netweaver_preconfigure/tools/beautify-assert-output.sh
-@@ -0,0 +1,34 @@
-+#!/bin/bash
-+
-+# default font color: Light Cyan, which should be readable on both bright and dark background
-+__FONT_COLOR=36m
-+
-+if [[ ${1}. == "font_light_gray". ]]; then
-+   __FONT_COLOR=37m
-+elif [[ ${1}. == "font_no_color". ]]; then
-+   __FONT_COLOR=30m
-+fi
-+
-+if [[ ${2}. == "reset." ]]; then
-+   awk 'BEGIN{printf ("\033['${__FONT_COLOR}'Resetting font color\n")}'
-+   exit
-+fi
-+
-+awk '{sub ("    \"msg\": ", "")}
-+  /TASK/{task_line=$0}
-+  /fatal:/{fatal_line=$0; nfatal[host]++}
-+  /...ignoring/{nfatal[host]--; if (nfatal[host]<0) nfatal[host]=0}
-+  /^[a-z]/&&/: \[/{gsub ("\\[", ""); gsub ("]", ""); gsub (":", ""); host=$2}
-+  /SAP note/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  /FAIL:/{nfail[host]++; print "\033[31m[" host"] "$0}
-+  /WARN:/{nwarn[host]++; print "\033[33m[" host"] "$0}
-+  /PASS:/{npass[host]++; print "\033[32m[" host"] "$0}
-+  /INFO:/{print "\033[34m[" host"] "$0}
-+  /changed/&&/unreachable/{print "\033['${__FONT_COLOR}'[" host"] "$0}
-+  END{print ("---"); for (var in npass) {printf ("[%s] ", var); if (nfatal[var]>0) {
-+        printf ("\033[31mFATAL ERROR!!! Playbook might have been aborted!!!\033['${__FONT_COLOR}' Last TASK and fatal output:\n"); print task_line, fatal_line
-+        exit 199
-+     }
-+     else printf ("\033[31mFAIL: %d  \033[33mWARN: %d  \033[32mPASS: %d\033['${__FONT_COLOR}'\n", nfail[var], nwarn[var], npass[var])}
-+     if (nfail[var] != 0) exit (nfail[var])
-+  }'

SPECS/rhel-system-roles-sap.spec

@@ -1,91 +1,81 @@
 # disable collection_artifact by default
 %bcond_with collection_artifact
 
-# disable collection by default since version 3.6.0 (1.3.4)
+# disable collection by default since version 3.6.0 (1.3.5)
 %bcond_with collection
 
-%if 0%{?fedora} || 0%{?rhel} > 8
-%bcond_without html
-%else
-# pandoc is not supported in rhel 7 and older,
-# which is needed for converting .md to .html.
-%bcond_with html
-%endif
+# remove sap_vm_preconfigure from sap_infrastructure (since version 1.1.3)
+%global remove_sap_vm_preconfigure 1
+
+%global collection_name_sap_install sap_install
+%global collection_name_sap_infrastructure sap_infrastructure
 
-%global collection_name sap_install
 %if 0%{?rhel}
-%define package_name rhel-system-roles-sap
+%global package_name rhel-system-roles-sap
 %global collection_namespace redhat
 %else
-%define package_name linux-system-roles-sap
+%global package_name linux-system-roles-sap
 %global collection_namespace community
 %endif
 
 # collection_version has to be increased by every rebuild
 # otherwise, it cannot be uploaded to Automation Hub and Galaxy
 # due to version conflict
-%define collection_version 1.3.5
+%global collection_sap_install_version 1.7.1
+%global collection_sap_infrastructure_version 1.1.3
+%global build_tool_version 1.7.1
 
-%global mainid e2a233f5a0cb68363798bf014b16552cca681bd0
-%global commit_id_sap_install %{collection_version}
+%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 1.108.0
+%global mainid_build_tools %{collection_sap_install_version}
+%global commit_id_sap_install %{collection_sap_install_version}
+%global commit_id_sap_infrastructure %{collection_sap_infrastructure_version}
+# roles sap_install, to get the list of supported roles: ls -l redhat.sap_install-*/roles/
 %global rolename1 sap_general_preconfigure
 %global rolename2 sap_ha_install_hana_hsr
 %global rolename3 sap_hana_install
 %global rolename4 sap_hana_preconfigure
 %global rolename5 sap_ha_pacemaker_cluster
-%global rolename6 sap_hypervisor_node_preconfigure
+%global rolename6 sap_maintain_etc_hosts
 %global rolename7 sap_netweaver_preconfigure
 %global rolename8 sap_swpm
-%global rolename9 sap_vm_preconfigure
+# roles sap_infrastructure, to get the list of supported roles: ls -l redhat.sap_infrastructure-*/roles/
+%global rolename20 sap_hypervisor_node_preconfigure
+%if %{remove_sap_vm_preconfigure}
+%global rolename21 %nil
+%else
+%global rolename21 sap_vm_preconfigure
+%endif
+%global rolename22 sap_vm_provision
 %global src_owner linux-system-roles
 %global github_repo_sap_install redhat.sap_install
-%global rolename_rhel %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename6} %{rolename7} %{rolename8} %{rolename9} 
+%global github_repo_sap_infrastructure redhat.sap_infrastructure
+%global rolename_sap_install %{rolename1} %{rolename2} %{rolename3} %{rolename4} %{rolename5} %{rolename6} %{rolename7} %{rolename8} 
+%global rolename_sap_infrastructure %{rolename20} %{rolename21} %{rolename22}
 %global rolenames %{rolename_rhel}
 
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.8.7
+Release: 1%{?dist}
 License: GPL-3.0-or-later
 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
 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
-Patch2: redhat.sap_install-1.3.4-add_tests.patch
-
-# add tools files
-Patch3: redhat.sap_install-1.3.4-add_tools.patch
+Source2: https://github.com/redhat-sap/redhat.sap_infrastructure/archive/%{commit_id_sap_infrastructure}/%{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}.tar.gz
+Source3: https://github.com/ngothan/build-tools/archive/%{mainid_build_tools}/build-tools-%{mainid_build_tools}.tar.gz
 
 BuildArch: noarch
 
 Requires: rhel-system-roles
 
-%if %{with html}
-# Requirements for md2html.sh to build the documentation
-%if 0%{?fedora} || 0%{?rhel} >= 9
-BuildRequires: rubygem-kramdown-parser-gfm
-%else
-BuildRequires: pandoc
-BuildRequires: asciidoc
-BuildRequires: highlight
-%endif
-%endif
+BuildRequires: tar
 
 # Requirements for galaxy_transform.py
-BuildRequires: python3
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: python3dist(ruamel.yaml)
+BuildRequires: python3-ruamel-yaml
 Requires: python3-jmespath
 Requires: python3-netaddr
-%else
-BuildRequires: python3-ruamel-yaml
-Requires: python-jmespath
-Requires: python-netaddr
-%endif
 
 # NOTE: ansible-core is in rhel-8.6 and newer, but not installable
 # in buildroot as it depended on modular Python.
@@ -95,25 +85,20 @@ Requires: python-netaddr
 BuildRequires: ansible-core >= 2.11.0
 Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %endif
-%endif
-
 %if %{undefined __ansible_provides}
-Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{version}
+Provides: ansible-collection(%{collection_namespace}.%{collection_name_sap_install}) = %{version}
+Provides: ansible-collection-%{collection_namespace}.%collection_name_sap_infrastructure} = %{version}
 %endif
 # be compatible with the usual Fedora Provides:
-Provides: ansible-collection-%{collection_namespace}-%{collection_name} = %{version}-%{release}
+Provides: ansible-collection-%{collection_namespace}-%{collection_name_sap_install} = %{version}-%{release}
+Provides: ansible-collection-%{collection_namespace}-%collection_name_sap_infrastructure} = %{version}-%{release}
+%endif
 
 # ansible-galaxy is available by ansible-core on RHEL 8.6 and newer at buildtime.
 %define ansible_collection_build() ansible-galaxy collection build
-%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
-
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
-%else
-%if %{?ansible_collection_files:0}%{!?ansible_collection_files:1}
+%define ansible_collection_sap_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz
+%define ansible_collection_infrastructure_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name_sap_infrastructure}-%{collection_sap_infrastructure_version}.tar.gz
 %define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/
-%endif
-%endif
 
 %description
 Collection of Ansible roles which configures a RHEL system according
@@ -124,19 +109,22 @@ to applicable SAP notes so that any SAP software can be installed.
 Summary: Collection artifact to import to Automation Hub / Ansible Galaxy
 
 %description collection-artifact
-Collection artifact for %{name}. This package contains %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
+Collection artifact for %{name}. This package contains:
+ * %{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz
+ * %{collection_namespace}-%{collection_name_sap_infrastructure}-%{collection_sap_infrastructure_version}.tar.gz
 %endif
 
 %prep
-%setup -q -a1 -n auto-maintenance-%{mainid}
+%setup -q -a1 -a2 -a3 -n auto-maintenance-%{mainid}
 
-pushd %{github_repo_sap_install}-%{commit_id_sap_install}/
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-# workaround for md2html error
-sed -i -e "s|for POWER ||g" roles/sap_hana_preconfigure/README.md
-popd
+# unpack collection tar files
+%if %{without collection}
+mkdir -p %{collection_dir_sap_install} %{collection_dir_sap_infrastructure}
+# sap_install collection
+tar xf %{github_repo_sap_install}-%{commit_id_sap_install}/%{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz -C %{collection_dir_sap_install}
+# sap_infrastructure collection
+tar xf %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/%{collection_namespace}-%{collection_name_sap_infrastructure}-%{commit_id_sap_infrastructure}.tar.gz -C %{collection_dir_sap_infrastructure}
+%endif
 
 # remove zero file and symlinks
 find . -type f -size 0 -delete
@@ -145,42 +133,49 @@ find . -type l -delete
 # fix python and bash shebangs
 find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!/usr/bin/python3=' {} +
 find -type f \( -iname "*.sh" \) -exec sed -i '1s=^#! */bin/bash=#!/usr/bin/bash=' {} +
+find -type f \( -iname "*.sh" \) -exec sed -i '1s=^#! */usr/bin/env bash=#!/usr/bin/bash=' {} +
 
-# remove json files, these are already present in the collection subdirectory
-rm -f FILES.json MANIFEST.json
 
 %build
-%if %{with html}
-readmes=""
-for role in %{rolenames}; do
-    readmes="${readmes} %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md"
-done
-sh md2html.sh $readmes %{github_repo_sap_install}-%{commit_id_sap_install}/README.md
-%endif
-
 %if %{with collection}
 # create dest-path
 mkdir .collections
 
-for role in %{rolenames} ; do
-LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 lsr_role2collection.py --role "$role" \
+for role in %{rolename_sap_install} ; do
+  echo "Handling role $role..."
+  python3 lsr_role2collection.py --role "$role" \
     --src-path %{github_repo_sap_install}-%{commit_id_sap_install}/roles/"$role" \
     --src-owner %{src_owner} \
     --dest-path .collections \
     --namespace %{collection_namespace} \
-    --collection %{collection_name} \
-    --new-role "$new_role"
+    --collection %{collection_name_sap_install} \
+    --new-role "$role"
 done
 
-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}
+for role in %{rolename_sap_infrastructure} ; do
+  echo "Handling role $role..."
+  python3 lsr_role2collection.py --role "$role" \
+    --src-path %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/roles/"$role" \
+    --src-owner %{src_owner} \
+    --dest-path .collections \
+    --namespace %{collection_namespace} \
+    --collection %{collection_name_sap_infrastructure} \
+    --new-role "$role"
+done
 
-# Build the collection
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+# update galaxy.yml
+cp -av %{github_repo_sap_install}-%{commit_id_sap_install}/galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_install}/
+cp -av %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_infrastructure}/
+
+# Build the sap_install collection
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_install}/
 %ansible_collection_build
 popd
 
+# Build the sap_infrastructure collection
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_infrastructure}/
+%ansible_collection_build
+popd
 %endif
 
 %install
@@ -189,53 +184,67 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles \
 
 # create file selection for documents
 echo "%dir %{_pkgdocdir}" > files_section.txt
-cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.md $RPM_BUILD_ROOT%{_pkgdocdir}/
+cp -afv %{github_repo_sap_install}-%{commit_id_sap_install}/README.md $RPM_BUILD_ROOT%{_pkgdocdir}/
 
-%if %{with html}
-cp %{github_repo_sap_install}-%{commit_id_sap_install}/README.html $RPM_BUILD_ROOT%{_pkgdocdir}/
-%endif
 echo "%{_pkgdocdir}/README.*" >> files_section.txt
 
-for role in %{rolenames} ; do
-    mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/$role
-    cp -pR %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
-    install -m 644 %{github_repo_sap_install}-%{commit_id_sap_install}/LICENSE \
-        %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md \
-        $RPM_BUILD_ROOT%{_pkgdocdir}/$role/
-%if %{with html}
-install -m 644 %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.html \
+# install sap_install roles
+for role in %{rolename_sap_install} ; do
+  mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/$role
+  cp -pR %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role $RPM_BUILD_ROOT%{_datadir}/ansible/roles/
+  install -m 644 %{github_repo_sap_install}-%{commit_id_sap_install}/LICENSE \
+    %{github_repo_sap_install}-%{commit_id_sap_install}/roles/$role/README.md \
     $RPM_BUILD_ROOT%{_pkgdocdir}/$role/
-%endif
-    echo "%dir %{_pkgdocdir}/$role" >> files_section.txt
+  echo "%dir %{_pkgdocdir}/$role" >> files_section.txt
+done
+
+# 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/
+  install -m 644 %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/LICENSE \
+    %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/roles/$role/README.md \
+    $RPM_BUILD_ROOT%{_pkgdocdir}/$role/
+  echo "%dir %{_pkgdocdir}/$role" >> files_section.txt
 done
 
 # install collection files
 %if %{with collection}
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
-%ansible_collection_install
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_install}/
+%ansible_collection_sap_install
 popd
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_infrastructure}/
+%ansible_collection_infrastructure_install
+popd
+# update CHANGELOG.rst playbooks FILES.json README.md MANIFEST.json
+for f in CHANGELOG.rst playbooks FILES.json README.md MANIFEST.json ; do
+   cp -afv %{github_repo_sap_install}-%{commit_id_sap_install}/$f $RPM_BUILD_ROOT/%{ansible_collection_files}/%{collection_name_sap_install}/
+   cp -afv %{github_repo_sap_infrastructure}-%{commit_id_sap_infrastructure}/$f $RPM_BUILD_ROOT/%{ansible_collection_files}/%{collection_name_sap_infrastructure}/
+done
 %else
-cp -pR %{github_repo_sap_install}-%{commit_id_sap_install}/collections $RPM_BUILD_ROOT%{_datadir}/ansible/
+cp -pR collections $RPM_BUILD_ROOT%{_datadir}/ansible/
 %endif
 
 # install collection_artifact
 %if %{with collection_artifact}
 # Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
-mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz $RPM_BUILD_ROOT%{_datadir}/ansible/collections/
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_install}/
+mv %{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz \
+$RPM_BUILD_ROOT%{_datadir}/ansible/collections/
+popd
+pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name_sap_infrastructure}/
+mv %{collection_namespace}-%{collection_name_sap_infrastructure}-%{collection_sap_infrastructure_version}.tar.gz \
+$RPM_BUILD_ROOT%{_datadir}/ansible/collections/
 popd
 %endif
 
+
 %files -f files_section.txt
 %dir %{_datadir}/ansible
 %dir %{_datadir}/ansible/roles
 %doc %{_pkgdocdir}/*/README.md
 %license %{_pkgdocdir}/*/LICENSE
 %{_datadir}/ansible/roles/*
-
-%if %{with html}
-%{_pkgdocdir}/*/README.html
-%endif
 %if %{with collection}
 %{ansible_collection_files}
 %else
@@ -243,106 +252,182 @@ popd
 %endif
 %if %{with collection_artifact}
 %files collection-artifact
-%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz
+%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name_sap_install}-%{collection_sap_install_version}.tar.gz
+%{_datadir}/ansible/collections/%{collection_namespace}-%{collection_name_sap_infrastructure}-%{collection_sap_infrastructure_version}.tar.gz
 %endif
 
 %changelog
-* Mon Feb 05 2024 Than Ngo <than@redhat.com> - 3.6.0-2
+* Wed Aug 13 2025 Than Ngo <than@redhat.com> - 3.8.7-1
+- Fix findings found by SAST
+- Include sap_infrastructure-1.1.3 and sap_install-1.7.1
+  Resolves: RHEL-96864
+
+* Thu Jun 26 2025 Than Ngo <than@redhat.com> - 3.8.6-1
+- Resolves: RHEL-96864, include new collcection redhat.sap_install and redhat.sap_infrastructure
+
+* Wed Feb 05 2025 Than Ngo <than@redhat.com> - 3.8.5-1
+- Fix check mode for largesend.conf on ppc64le
+- Fix the package name of the RHEL 10 Power tools
+  Related: RHEL-74075
+
+* Tue Feb 04 2025 Than Ngo <than@redhat.com> - 3.8.4-1
+- Related: RHEL-74075, Fix checkmode in sap_hana_preconfigure
+
+* Fri Jan 31 2025 Than Ngo <than@redhat.com> - 3.8.3-1
+- Related: RHEL-74075, Fix checkmode for sysctl
+
+* 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
+
+* Mon Jan 20 2025 Than Ngo <than@redhat.com> - 3.8.0-1
+- Resolves: RHEL-74075, new collcection redhat.sap_install and redhat.sap_infrastructure
+
+* 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
 - sap_hypervisor_node_preconfigure: fix for role name and path for included tasks
 - update collection files
-Related: RHEL-16897
+Related: RHEL-16895
 
-* Thu Jan 25 2024 Than Ngo <than@redhat.com> - 3.6.0-1
+* Thu Jan 25 2024 Than Ngo <than@redhat.com> - 3.6.0-3
+- fix typo
+Related: RHEL-16895
+
+* Thu Jan 25 2024 Than Ngo <than@redhat.com> - 3.6.0-2
+- add tests and tools
+- fix bash and python shebangs
+Related: RHEL-16895
+
+* Mon Jan 22 2024 Than Ngo <than@redhat.com> - 3.6.0-1
 - rebase sap roles to version 1.3.4
 - add collection files
 - update README files and add missing galaxy.yml, LICENSE
 - fix syntax error for defining dependent collections in galaxy.yml
-- add tools and tests
-Resolves: RHEL-16897
+Resolves: RHEL-16895
 
-* Mon May 08 2023 Than Ngo <than@redhat.com> - 3.5.0-1
-- updated README.md files for sap and sap_swpm roles
-- migrated to SPDX license
-- converted patch macro use to the most compatible syntax
-- rebased sap roles to version 1.2.3
-Resolves: #2185037
+* Thu May 04 2023 Than Ngo <than@redhat.com> - 3.5.0-2
+- Related: #2185038, update README.md files
 
+* Tue May 02 2023 Than Ngo <than@redhat.com> - 3.5.0-1
+- update README, drop requirements-sap_swpm.yml
+- migrate to SPDC license
+- convert patch macro use to the most compatible syntax
+- rebase sap roles to version 1.2.3
+Resolves: #2185038
 
 * Mon Jan 30 2023 Than Ngo <than@redhat.com> - 3.4.0-3
-- Related: #2155876, rebase sap roles to version 1.2.1
+- Related: #2155870, rebase sap roles to version 1.2.1
 
 * Thu Jan 19 2023 Than Ngo <than@redhat.com> - 3.4.0-2
-- Related: #2155876, compat-sap-c++-10 is not available for RHEL 8.2 and earlier on hardware platform s390x
+- compat-sap-c++-10 is not available for RHEL 8.2 and earlier on hardware platform s390x
+Related: #2155870
 
-* Wed Jan 11 2023 Than Ngo <than@redhat.com> - 3.4.0-1
-- Resolves: #2155876, rebase sap roles to version 1.2.0
+* Tue Jan 10 2023 Than Ngo <than@redhat.com> - 3.4.0-1
+- Resolves: #2155870, rebase to 1.2.0 upstream version
 
-* Tue Nov 22 2022 Than Ngo <than@redhat.com> - 3.3.0-4
-- Resolves: #2142957, drop deprecated paramater for Ansible 2.14
+* Mon Nov 28 2022 Than Ngo <than@redhat.com> - 3.3.0-5
+- Related: #2143280, add missing repo vars for rhel-9.x
 
-* Fri Jul 15 2022 Than Ngo <than@redhat.com> - 3.3.0-3
-- update galaxy.yml and README.md and url
-Related: #2103633
+* Fri Nov 25 2022 Than Ngo <than@redhat.com> - 3.3.0-4
+- Resolves: #2143280, drop deprecated paramater for Ansible 2.14
+
+* Thu Jul 14 2022 Than Ngo <than@redhat.com> - 3.3.0-3
+- more fixes, update README.md
+Related: #2101373
 
 * Tue Jul 12 2022 Than Ngo <than@redhat.com> - 3.3.0-2
 - make the role Ansible 2.13 compliant
 - get rid of all the new ansible-lint 6.3.0 errors for preconfigure and sap_hana_install roles
-Resolves: #2103633
+Resolves: #2101373
 
 * Mon Jul 04 2022 Than Ngo <than@redhat.com> - 3.3.0-1
-- Resolves: #2103633, include roles for setting up a two-node SAP HANA pacemaker cluster
+- Resolves: #2101373, include roles for setting up a two-node SAP HANA pacemaker cluster
 
-* Thu Jun 09 2022 Than Ngo <than@redhat.com> - 3.2.0-3
-- sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
-- sap_general_preconfigure: fix variable inclusion for RHEL minor releases
-Related: #2063050
+* Wed Jun 08 2022 Than Ngo <than@redhat.com> - 3.2.0-5
+- increase release
+Related: #2065407
 
-* Wed Jun 08 2022 Than Ngo <than@redhat.com> - 3.2.0-2
-- sap_general_preconfigure: do not attempt to enable HANA repos for s390x
+* Wed Jun 08 2022 Than Ngo <than@redhat.com> - 3.2.0-4
 - sap_hana_preconfigure: using wrong variable name
-- sap_hana_preconfigure: Fix issue sap-linuxlab#154
-Related: #2063050
+- do not attempt to enable HANA repos for s390x
+- sap_general_preconfigure: fix variable inclusion for RHEL minor releases
+- sap_hana_preconfigure: Add vars for RHEL 9.1 managed nodes
+- sap_hana_preconfigure: Fix issue #154
+Related: #2065407
 
-* Mon Mar 21 2022 Than Ngo <than@redhat.com> - 3.2.0-1
-- Resolves: #2063050, rebase to new upstream org sap-linuxlab
+* Sun Mar 13 2022 Than Ngo <than@redhat.com> - 3.2.0-3
+- Resolves: #2065407, new rebase
 
-* Fri Dec 03 2021 Than Ngo <than@redhat.com> - 3.1.1-10
-- Related: #2016858, increase release to avoid update conflict
+* Tue Feb 22 2022 Than Ngo <than@redhat.com> - 3.2.0-2
+- Related: #2047282, new rebase, fixed collection basename
 
-* Fri Dec 03 2021 Than Ngo <than@redhat.com> - 3.1.1-8
-- Related: #2016858, rebase
+* Mon Jan 31 2022 Than Ngo <than@redhat.com> - 3.2.0-1
+- Resolves: #2047282, Rebase to new upstream org sap-linuxlab
 
-* Tue Nov 16 2021 Than Ngo <than@redhat.com> - 3.1.1-7
-- Resolves: #2016858, ansible-lint cleanup
+* Fri Dec 03 2021 Than Ngo <than@redhat.com> - 3.1.1-15
+- Related: #2021579, ansible-lint cleanup
 
-* Wed Sep 08 2021 Than Ngo <than@redhat.com> - 3.1.1-6
-- set min kernel version for RHEL 8.4 x86_64
+* Tue Nov 16 2021 Than Ngo <than@redhat.com> - 3.1.1-14
+- Resolves: #2021579, ansible-lint cleanup
+
+* Fri Oct 15 2021 Than Ngo <than@redhat.com> - 3.1.1-13
+- Fix the version of the collection tar file
+
+* Fri Oct 15 2021 Than Ngo <than@redhat.com> - 3.1.1-12
+- Resolves: #2003630, Pepare the roles for ansible-core 2.11: Only use ansible.core modules
+
+* Wed Sep 01 2021 Than Ngo <than@redhat.com> - 3.1.1-11
+- fix yum group install errors on RHEL 7
 - use grubby for setting tsx=on
-- add tsx=on to the kernel command line unconditionally
+- set min kernel version for RHEL 8.4 x86_64
 
-* Wed Sep 01 2021 Than Ngo <than@redhat.com> - 3.1.1-5
-- Related: #1928398, fix yum group install errors on RHEL 7
+* Fri Aug 20 2021 Than Ngo <than@redhat.com> - 3.1.1-10
+- Related: #1977195, fix #149, #177, #193, #194
 
-* Fri Aug 20 2021 Than Ngo <than@redhat.com> - 3.1.1-4
-- Related: #1928398, fix #149, #177, #193, #194
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.1-9
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Mon Jul 12 2021 Than Ngo <than@redhat.com> - 3.1.1-3
-- add missing __sap_preconfigure_envgroups for RHEL 7.x
-- add __sap_hana_preconfigure_req_repos variables for RHEL 8.5 and later
-  Related: #1928398
+* Fri Jul 16 2021 Than Ngo <than@redhat.com> - 3.1.1-8
+- Related: #1977195, add missing vars/RedHat_9.yml in sap-netweaver-preconfigure
 
-* Thu Jul 01 2021 Than Ngo <than@redhat.com> - 3.1.1-2
-- Related: #1928398, add missing changelogs
+* Tue Jul 13 2021 Than Ngo <than@redhat.com> - 3.1.1-7
+- Related: #1977195, add missing __sap_preconfigure_envgroups for RHEL 7.x and
+  missing __sap_hana_preconfigure_req_repos variables for RHEL 8.5 and later
 
-* Tue Jun 29 2021 Than Ngo <than@redhat.com> - 3.1.1-1
-- Resolves: #1928398, rebase to 3.1.1 for Ansible Collections
+* Tue Jun 29 2021 Than Ngo <than@redhat.com> - 3.1.1-6
+- Resolves: #1977195, make RHEL system roles for SAP RHEL9 compatible
 
-* Fri Mar 05 2021 Than Ngo <than@redhat.com> - 3.0.1-4
-- fixed issue #130 in sap-preconfigure
-- fixed typos in README.md in sap_hana_preconfigure
-- added detailed explanations for sap_hana_preconfigure_kernel_parameters_ppc64le in README.md
-- fixed issue #170 in sap_hana_preconfigure
-  Related: #1891642
+* Mon Jun 28 2021 Than Ngo <than@redhat.com> - 3.1.1-5
+- updated tarball, galaxy.yml, README.md
+
+* Mon Jun 07 2021 Than Ngo <than@redhat.com> - 3.1.1-4
+- update README.md
+- Adding the -collection-artifact subpackage, enabled using
+  "--with collection_artifact". It is used for importing to
+  ansible galaxy/automation hub.
+
+* Fri May 21 2021 Than Ngo <than@redhat.com> - 3.1.1-3
+- convert roles to FQCN in the README files
+
+* Thu May 20 2021 Than Ngo <than@redhat.com> - 3.1.1-2
+- rename dashes by underscores and drop sap-
+
+* Tue May 18 2021 Than Ngo <than@redhat.com> - 3.1.1-1
+- rebase
+
+* Wed Apr 14 2021 Than Ngo <than@redhat.com> - 3.1.0-3
+- bz#1928398, rebuilt against new python-ruamel-yaml-0.15.100 for conversion problem
+
+* Mon Mar 22 2021 Than Ngo <than@redhat.com> - 3.1.0-2
+- rebase
+
+* Tue Mar 02 2021 Than Ngo <than@redhat.com> - 3.1.0-1
+- added support Transfer SAP roles into collection format
 
 * Wed Feb 24 2021 Than Ngo <than@redhat.com> - 3.0.1-3
 - Related: #1891642, fixed issue #125 in sap-preconfigure and #163 and #164 in sap-hana-preconfigure
@@ -360,6 +445,9 @@ Related: #2063050
 - Resolves: #1891638, bug fixes
 - Resolves: #1891642, new features
 
+* Tue Jan 12 2021 Than Ngo <than@redhat.com> - 2.0.0-8
+- RHEL 9.0.0 Alpha build
+
 * Mon Sep 21 2020 Than Ngo <than@redhat.com> - 2.0.0-7
 - Related: #1867027, fix #119