.gitignore

@@ -1 +1,6 @@
-SOURCES/sap_cluster_connector-f3644f5.tar.gz
+/*.tar.gz
+/*.src.rpm
+/.build-*.log
+/*/
+!/tests/
+/tests/*.retry

.sap-cluster-connector.metadata

@@ -1 +0,0 @@
-4f1e98fe6ac60a513a1ce47b433b4fa637070be5 SOURCES/sap_cluster_connector-f3644f5.tar.gz

SOURCES/bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch

@@ -1,38 +0,0 @@
-From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001
-From: Frank Danapfel <frank.danapfel@redhat.com>
-Date: Tue, 21 Apr 2020 14:11:36 +0200
-Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn
- function
-
----
- redhat/sap_cluster_connector | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/redhat/sap_cluster_connector b/redhat/sap_cluster_connector
-index a88b27a..6250887 100755
---- a/redhat/sap_cluster_connector
-+++ b/redhat/sap_cluster_connector
-@@ -401,7 +401,7 @@ sub list_sap_nodes {
- 	chomp $crm_res_location_in;
- 	#printf "DBG: where-result: %s\n", $crm_res_location_in;
- 	my $current_node="";
--	if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+(\w+)\W*/ ) {
-+	if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+([a-zA-Z0-9_-]+)/ ) {
- 		#printf "DBG: where-result: match\n";
- 		$current_node = $2;
- 	}
-@@ -425,12 +425,12 @@ sub list_sap_nodes {
- 	while (<PTEST>) {
- 		chomp;
- 		# printf "%s\n", $_;
--		if ( /^group_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
-+		if ( /^group_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
- 			# printf "DBG: group 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
- 			$resource{$1}->{nodes}->{$2}->{gc}=$3;
- 			push(@{$resource{$1}->{priorities}->{$3}}, $2);
- 		}
--		if ( /^native_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
-+		if ( /^native_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
- 			# printf "DBG: native 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
- 			$resource{$1}->{nodes}->{$2}->{nc}=$3;
- 			push(@{$resource{$1}->{priorities}->{$3}}, $2);

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sap-cluster-connector.spec

@@ -20,12 +20,12 @@
 #
 
 %global sap_script_prefix sap_cluster_connector
-%global sap_script_hash f3644f5
+%global sap_script_hash 42d6ce2
 
 Name:		sap-cluster-connector
 Summary:	SAP cluster connector script
 Version:	3.0.1
-Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	8%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
 License:	GPLv2+
 URL:		https://github.com/fdanapfel/sap_cluster_connector
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -34,12 +34,13 @@ Group:		System Environment/Base
 Group:		Productivity/Clustering/HA
 %endif
 Source0:	%{sap_script_prefix}-%{sap_script_hash}.tar.gz
-Patch0: 	bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch
 
 BuildArch:	noarch
 
-Requires:	resource-agents-sap >= 4.1.1-28
-Requires:	perl
+BuildRequires: perl-generators
+
+Requires:	resource-agents-sap >= 4.8.0
+Requires:	perl-interpreter
 
 %description
 The SAP connector script interface with Pacemaker to allow SAP
@@ -47,11 +48,11 @@ instances to be managed in a cluster environment.
 
 %prep
 %setup -q -n %{sap_script_prefix}-%{sap_script_hash}
-%patch0 -p1
 
 %build
 
 %install
+rm -rf %{buildroot}
 test -d %{buildroot}/%{_bindir} || mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/%{_datadir}/sap_cluster_connector
 mkdir -p %{buildroot}/%{_mandir}/man8
@@ -60,9 +61,6 @@ cp -rv redhat/{run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
 gzip redhat/man/*.8
 cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{_bindir}/sap_cluster_connector
@@ -70,12 +68,17 @@ rm -rf %{buildroot}
 %{_datadir}/sap_cluster_connector
 
 %changelog
-* Thu Apr 30 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-5
-- sap-cluster-connector: allow dashes/underscores in nodenames
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.0.1-8.1
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-  Resolves: rhbz#1827096
+* Tue Jul 02 2024 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-8
+- Add package to RHEL 10.
 
-* Tue Jun 25 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 3.0.1-4
-- Initial build as separate package
+  Resolves: RHEL-40576
 
-  Resolves: rhbz#1688346
+- Changed perl dependency to perl-interpreter.
+
+  Resolves: RHEL-45726
+
+# vim:set ai ts=4 sw=4 sts=4 et:

sources

@@ -0,0 +1 @@
+SHA512 (sap_cluster_connector-42d6ce2.tar.gz) = aed98615d4e4b679eead842ac4cac4d3ce155f33f24e0470067e06706fd916efc8d0546a8af93783b6de568e05bc32230b1fc0ab4991ef1b4a1cf9e624989767

tests/run_tests.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+err=0
+
+for bin in "sap_cluster_connector help"; do
+	output="$($bin 2>&1)"
+	if [ $? -ne 0 ]; then
+		echo -e "ERROR: $bin failed:\n$output"
+		err=$((err+1))
+	else
+		echo "INFO: $bin works..."
+	fi
+done
+
+if [ $err -ge 1 ]; then
+	echo -e "\nERROR: $err tests FAILED..."
+	exit 1
+fi

tests/tests.yml

@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+    - role: standard-test-basic
+      tags:
+        - classic
+        - container
+      required_packages:
+        - sap-cluster-connector
+
+      tests:
+        - subpackage_tests:
+            dir: .
+            run: ./run_tests.sh