90 changed files with 24 additions and 89 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,12 @@
-/*.tar.gz
+SOURCES/ClusterLabs-resource-agents-55a4e2c9.tar.gz
-/*.rpm
+SOURCES/aliyun-cli-2.1.10.tar.gz
-/*.whl
+SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz
-/.*
+SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz
-/*/
+SOURCES/aliyun-python-sdk-vpc-3.0.2.tar.gz
-!/tests/
+SOURCES/colorama-0.3.3.tar.gz
-/tests/*.retry
+SOURCES/google-cloud-sdk-360.0.0-linux-x86_64.tar.gz
 SOURCES/httplib2-0.20.4.tar.gz
 SOURCES/pycryptodome-3.20.0.tar.gz
 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
 SOURCES/pyroute2-0.4.13.tar.gz
 SOURCES/urllib3-1.26.18.tar.gz
--- a/.resource-agents.metadata
+++ b/.resource-agents.metadata
@ -0,0 +1,12 @@
 dfc65f4cac3f95026b2f5674019814a527333004 SOURCES/ClusterLabs-resource-agents-55a4e2c9.tar.gz
 306e131d8908ca794276bfe3a0b55ccc3bbd482f SOURCES/aliyun-cli-2.1.10.tar.gz
 0a56f6d9ed2014a363486d33b63eca094379be06 SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz
 c2a98b9a1562d223a76514f05028488ca000c395 SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz
 f14647a4d37a9a254c4e711b95a7654fc418e41e SOURCES/aliyun-python-sdk-vpc-3.0.2.tar.gz
 0fe5bd8bca54dd71223778a1e0bcca9af324abb1 SOURCES/colorama-0.3.3.tar.gz
 81f039cf075e9c8b70d5af99c189296a9e031de3 SOURCES/google-cloud-sdk-360.0.0-linux-x86_64.tar.gz
 7caf4412d9473bf17352316249a8133fa70b7e37 SOURCES/httplib2-0.20.4.tar.gz
 c55d177e9484d974c95078d4ae945f89ba2c7251 SOURCES/pycryptodome-3.20.0.tar.gz
 c8307f47e3b75a2d02af72982a2dfefa3f56e407 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
 147149db11104c06d405fd077dcd2aa1c345f109 SOURCES/pyroute2-0.4.13.tar.gz
 84e2852d8da1655373f7ce5e7d5d3e256b62b4e4 SOURCES/urllib3-1.26.18.tar.gz
--- a/SOURCES/10-gcloud-support-info.patch
+++ b/SOURCES/10-gcloud-support-info.patch
--- a/SOURCES/7-gcp-bundled.patch
+++ b/SOURCES/7-gcp-bundled.patch
--- a/SOURCES/9-google-cloud-sdk-oauth2client-python-rsa-to-cryptography.patch
+++ b/SOURCES/9-google-cloud-sdk-oauth2client-python-rsa-to-cryptography.patch
--- a/SOURCES/RHEL-15302-1-exportfs-make-fsid-optional.patch
+++ b/SOURCES/RHEL-15302-1-exportfs-make-fsid-optional.patch
--- a/SOURCES/RHEL-15302-2-ocft-exportfs-remove-fsid-required-test.patch
+++ b/SOURCES/RHEL-15302-2-ocft-exportfs-remove-fsid-required-test.patch
--- a/SOURCES/RHEL-15305-1-findif.sh-fix-loopback-handling.patch
+++ b/SOURCES/RHEL-15305-1-findif.sh-fix-loopback-handling.patch
--- a/SOURCES/RHEL-15305-2-findif.sh-dont-use-table-parameter.patch
+++ b/SOURCES/RHEL-15305-2-findif.sh-dont-use-table-parameter.patch
--- a/SOURCES/RHEL-16248-aws-vpc-move-ip-aws-vpc-route53-awseip-awsvip-auth_type-role.patch
+++ b/SOURCES/RHEL-16248-aws-vpc-move-ip-aws-vpc-route53-awseip-awsvip-auth_type-role.patch
--- a/SOURCES/RHEL-17083-findif-EOS-fix.patch
+++ b/SOURCES/RHEL-17083-findif-EOS-fix.patch
--- a/SOURCES/RHEL-32828-db2-fix-OCF_SUCESS-typo.patch
+++ b/SOURCES/RHEL-32828-db2-fix-OCF_SUCESS-typo.patch
--- a/SOURCES/RHEL-34137-aws-agents-use-curl_retry.patch
+++ b/SOURCES/RHEL-34137-aws-agents-use-curl_retry.patch
--- a/SOURCES/RHEL-44923-aliyun-gcp-fix-bundled-urllib3-CVE-2024-37891.patch
+++ b/SOURCES/RHEL-44923-aliyun-gcp-fix-bundled-urllib3-CVE-2024-37891.patch
--- a/SOURCES/RHEL-50360-setuptools-fix-CVE-2024-6345.patch
+++ b/SOURCES/RHEL-50360-setuptools-fix-CVE-2024-6345.patch
--- a/SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch
+++ b/SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch
--- a/SOURCES/aliyun-vpc-move-ip-4-bundled.patch
+++ b/SOURCES/aliyun-vpc-move-ip-4-bundled.patch
--- a/SOURCES/aliyuncli-python3-fixes.patch
+++ b/SOURCES/aliyuncli-python3-fixes.patch
--- a/SOURCES/bz1691456-gcloud-dont-detect-python2.patch
+++ b/SOURCES/bz1691456-gcloud-dont-detect-python2.patch
--- a/SOURCES/bz1872754-pgsqlms-new-ra.patch
+++ b/SOURCES/bz1872754-pgsqlms-new-ra.patch
--- a/SOURCES/bz1904465-mysql-common-improve-error-message.patch
+++ b/SOURCES/bz1904465-mysql-common-improve-error-message.patch
--- a/SOURCES/bz1905820-LVM-activate-fix-return-codes.patch
+++ b/SOURCES/bz1905820-LVM-activate-fix-return-codes.patch
--- a/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-openstack-agents-set-domain-parameters-default.patch
+++ b/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-openstack-agents-set-domain-parameters-default.patch
--- a/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-openstack-agents-warn-when-openstackcli-slow.patch
+++ b/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-openstack-agents-warn-when-openstackcli-slow.patch
--- a/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-update-openstack-agents.patch
+++ b/SOURCES/bz1908146-bz1908147-bz1908148-bz1949114-update-openstack-agents.patch
--- a/SOURCES/bz1908146-bz1908147-bz1949114-openstack-agents-fixes.patch
+++ b/SOURCES/bz1908146-bz1908147-bz1949114-openstack-agents-fixes.patch
--- a/SOURCES/bz1908148-openstack-info-fix-bashism.patch
+++ b/SOURCES/bz1908148-openstack-info-fix-bashism.patch
--- a/SOURCES/bz1935422-python-pygments-fix-CVE-2021-20270.patch
+++ b/SOURCES/bz1935422-python-pygments-fix-CVE-2021-20270.patch
--- a/SOURCES/bz1943464-python-pygments-fix-CVE-2021-27291.patch
+++ b/SOURCES/bz1943464-python-pygments-fix-CVE-2021-27291.patch
--- a/SOURCES/bz1977012-azure-events-az-new-ra.patch
+++ b/SOURCES/bz1977012-azure-events-az-new-ra.patch
--- a/SOURCES/bz1992661-mysql-use-ssl-mode.patch
+++ b/SOURCES/bz1992661-mysql-use-ssl-mode.patch
--- a/SOURCES/bz1995178-storage-mon-fix-typo.patch
+++ b/SOURCES/bz1995178-storage-mon-fix-typo.patch
--- a/SOURCES/bz2003117-all-agents-set-correct-agent-ocf-version.patch
+++ b/SOURCES/bz2003117-all-agents-set-correct-agent-ocf-version.patch
--- a/SOURCES/bz2008333-gcp-pd-move-gcp-vpc-move-route-dont-fail-due-to-incorrect-rc.patch
+++ b/SOURCES/bz2008333-gcp-pd-move-gcp-vpc-move-route-dont-fail-due-to-incorrect-rc.patch
--- a/SOURCES/bz2012057-Route-return-OCF_NOT_RUNNING-missing-route.patch
+++ b/SOURCES/bz2012057-Route-return-OCF_NOT_RUNNING-missing-route.patch
--- a/SOURCES/bz2014415-nfsserver-add-nfs_server_scope-parameter.patch
+++ b/SOURCES/bz2014415-nfsserver-add-nfs_server_scope-parameter.patch
--- a/SOURCES/bz2015789-gcp-ilb-1-fix-log_enable.patch
+++ b/SOURCES/bz2015789-gcp-ilb-1-fix-log_enable.patch
--- a/SOURCES/bz2015789-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
+++ b/SOURCES/bz2015789-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
--- a/SOURCES/bz2015789-gcp-ilb-3-use-bundled-gcloud.patch
+++ b/SOURCES/bz2015789-gcp-ilb-3-use-bundled-gcloud.patch
--- a/SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch
+++ b/SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch
--- a/SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch
+++ b/SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch
--- a/SOURCES/bz2029706-2-db2-fixes.patch
+++ b/SOURCES/bz2029706-2-db2-fixes.patch
--- a/SOURCES/bz2039692-mysql-1-replication-fixes.patch
+++ b/SOURCES/bz2039692-mysql-1-replication-fixes.patch
--- a/SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch
+++ b/SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch
--- a/SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch
+++ b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch
--- a/SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
+++ b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
--- a/SOURCES/bz2049319-Filesystem-add-support-for-Amazon-EFS.patch
+++ b/SOURCES/bz2049319-Filesystem-add-support-for-Amazon-EFS.patch
--- a/SOURCES/bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
+++ b/SOURCES/bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
--- a/SOURCES/bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
+++ b/SOURCES/bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
--- a/SOURCES/bz2064342-1-IPsrcaddr-dhcp-warning.patch
+++ b/SOURCES/bz2064342-1-IPsrcaddr-dhcp-warning.patch
--- a/SOURCES/bz2064342-2-IPsrcaddr-error-message-route-not-found.patch
+++ b/SOURCES/bz2064342-2-IPsrcaddr-error-message-route-not-found.patch
--- a/SOURCES/bz2064342-3-IPsrcaddr-fix-indentation.patch
+++ b/SOURCES/bz2064342-3-IPsrcaddr-fix-indentation.patch
--- a/SOURCES/bz2064342-4-IPsrcaddr-fixes.patch
+++ b/SOURCES/bz2064342-4-IPsrcaddr-fixes.patch
--- a/SOURCES/bz2072043-LVM-activate-fix-fence-issue.patch
+++ b/SOURCES/bz2072043-LVM-activate-fix-fence-issue.patch
--- a/SOURCES/bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
+++ b/SOURCES/bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
--- a/SOURCES/bz2090370-CTDB-move-process-to-root-cgroup-if-rt-enabled.patch
+++ b/SOURCES/bz2090370-CTDB-move-process-to-root-cgroup-if-rt-enabled.patch
--- a/SOURCES/bz2093214-aws-vpc-move-ip-add-interface-label-support.patch
+++ b/SOURCES/bz2093214-aws-vpc-move-ip-add-interface-label-support.patch
--- a/SOURCES/bz2103370-ocf-tester-1-update.patch
+++ b/SOURCES/bz2103370-ocf-tester-1-update.patch
--- a/SOURCES/bz2103370-ocf-tester-2-remove-deprecated-lrmd-lrmadmin-code.patch
+++ b/SOURCES/bz2103370-ocf-tester-2-remove-deprecated-lrmd-lrmadmin-code.patch
--- a/SOURCES/bz2109159-storage_mon-1-exit-after-help.patch
+++ b/SOURCES/bz2109159-storage_mon-1-exit-after-help.patch
--- a/SOURCES/bz2109159-storage_mon-2-fix-specified-scores-count.patch
+++ b/SOURCES/bz2109159-storage_mon-2-fix-specified-scores-count.patch
--- a/SOURCES/bz2109159-storage_mon-3-fix-child-process-exit.patch
+++ b/SOURCES/bz2109159-storage_mon-3-fix-child-process-exit.patch
--- a/SOURCES/bz2109159-storage_mon-4-fix-possible-false-negatives.patch
+++ b/SOURCES/bz2109159-storage_mon-4-fix-possible-false-negatives.patch
--- a/SOURCES/bz2116941-ethmonitor-ovsmonitor-pgsql-fix-attrd_updater-q.patch
+++ b/SOURCES/bz2116941-ethmonitor-ovsmonitor-pgsql-fix-attrd_updater-q.patch
--- a/SOURCES/bz2127117-nfsserver-nfsv4_only-parameter.patch
+++ b/SOURCES/bz2127117-nfsserver-nfsv4_only-parameter.patch
--- a/SOURCES/bz2133682-IPsrcaddr-proto-metric-scope-default-route-fixes.patch
+++ b/SOURCES/bz2133682-IPsrcaddr-proto-metric-scope-default-route-fixes.patch
--- a/SOURCES/bz2139131-mysql-common-return-error-if-kill-fails.patch
+++ b/SOURCES/bz2139131-mysql-common-return-error-if-kill-fails.patch
--- a/SOURCES/bz2141836-vdo-vol-dont-fail-probe-action.patch
+++ b/SOURCES/bz2141836-vdo-vol-dont-fail-probe-action.patch
--- a/SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch
+++ b/SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch
--- a/SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
+++ b/SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
--- a/SOURCES/bz2157873-1-all-ras-validate-all-OCF_CHECK_LEVEL-10.patch
+++ b/SOURCES/bz2157873-1-all-ras-validate-all-OCF_CHECK_LEVEL-10.patch
--- a/SOURCES/bz2157873-2-Filesystem-CTDB-validate-all-improvements.patch
+++ b/SOURCES/bz2157873-2-Filesystem-CTDB-validate-all-improvements.patch
--- a/SOURCES/bz2157873-3-pgsqlms-validate-all-OCF_CHECK_LEVEL-10.patch
+++ b/SOURCES/bz2157873-3-pgsqlms-validate-all-OCF_CHECK_LEVEL-10.patch
--- a/SOURCES/bz2157873-4-exportfs-pgsql-validate-all-fixes.patch
+++ b/SOURCES/bz2157873-4-exportfs-pgsql-validate-all-fixes.patch
--- a/SOURCES/bz2157873-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch
+++ b/SOURCES/bz2157873-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch
--- a/SOURCES/bz2181019-azure-events-1-fix-no-transition-summary.patch
+++ b/SOURCES/bz2181019-azure-events-1-fix-no-transition-summary.patch
--- a/SOURCES/bz2181019-azure-events-2-improve-logic.patch
+++ b/SOURCES/bz2181019-azure-events-2-improve-logic.patch
--- a/SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch
+++ b/SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch
--- a/SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch
+++ b/SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch
--- a/SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch
+++ b/SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch
--- a/SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch
+++ b/SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch
--- a/SOURCES/gcp-configure-skip-bundled-lib-checks.patch
+++ b/SOURCES/gcp-configure-skip-bundled-lib-checks.patch
--- a/SOURCES/nova-compute-wait-NovaEvacuate.patch
+++ b/SOURCES/nova-compute-wait-NovaEvacuate.patch
--- a/SOURCES/python3-syntax-fixes.patch
+++ b/SOURCES/python3-syntax-fixes.patch
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
 --- !Policy
 product_versions:
  - rhel-8
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,22 +0,0 @@
 ---
 xml:
    # Do not try to XML-validate this DTD file
    ignore:
        - /usr/share/resource-agents/ra-api-1.dtd
 files:
    # These paths are explicitly used in this package
    ignore:
        - /usr/lib/ocf/resource.d/heartbeat
        - /usr/lib/resource-agents
 badfuncs:
    # This program uses gethostbyname2, inet_aton, and inet_ntoa
    ignore:
        - /usr/libexec/heartbeat/send_arp
 upstream:
    ignore:
        # these files have to be bundled in resource-agents now
        - httplib2-0.20.4.tar.gz
        - pyparsing-2.4.7-py2.py3-none-any.whl
--- a/12
+++ b/12
@ -1,12 +0,0 @@
 SHA512 (ClusterLabs-resource-agents-55a4e2c9.tar.gz) = 0b8dbf466cc4be3e165e4fb3b6a3ce93a6b49a7f4a7dc27916bfe3ec0b5de1e9df5c114d255608fb6ba1ca945ba49a4626e95cd28d6852e2e09d099d6edcb00b
 SHA512 (aliyun-cli-2.1.10.tar.gz) = 1c883e1116b695ff87f81bebc506df04004d097157cd817ac8dc81a18bc4df308579c5c34b3396a90a59cd07f5d9079002295231d999fa26eaf56914ea6ede9f
 SHA512 (aliyun-python-sdk-core-2.13.1.tar.gz) = c9eaccf3ed06ff2f5edc89d605511223650816ae3b192e6149f1b113d1d04c05c5220bdd588dc83024486748354436fec65fa59f5858befaa7cf9524dbb6da19
 SHA512 (aliyun-python-sdk-ecs-4.9.3.tar.gz) = 83b35b7e774fa8892106f771731cc11ca823fe3d6f3e2f5bc5f075e475623573b9123e5ecb2a750d13ebcda9bc76242485636d2d3284c3eec89afcb4ec3070a4
 SHA512 (aliyun-python-sdk-vpc-3.0.2.tar.gz) = e9e4f8224f828a0e0737e4515799e62e4d3808ef2985ae733c8dbe88961daae2d7524000d1ec09e6a5d7ec9491f1e29365e61a4bcfa4b6dbf5a4ec338386e209
 SHA512 (colorama-0.3.3.tar.gz) = 2e960ee25f89ca4bc21fc5ab7dac12bd09c9139c4af04a5131ead31f01bb86af23e749e85dafe0bda814b032cc917ad03c0152b333eb532646603b470adbbb64
 SHA512 (google-cloud-sdk-360.0.0-linux-x86_64.tar.gz) = 0e441359edd981038310c7e66ed3cbdaff1c5b24264bdebdca351ea5cbdef7b54b8d9d56ee45c713f467e65f1bc949c7f5175cd06ed16eae05bd589b187b6260
 SHA512 (httplib2-0.20.4.tar.gz) = 67c553926c1e103800bf622a4bb9ee6c3222fb33526f94fc64afa7e876281551bb6e42c8fce5d956f1f64a1727a25d457d23acb26360b69493dcaa3f8991e0be
 SHA512 (pycryptodome-3.20.0.tar.gz) = 9fed02190db9ae71b6895af2525d7670858817acf213c494969104da81138dacb11bc00be83b308e070a2c90766cd763e25a611ada402b32f6160a8ac9283f85
 SHA512 (pyparsing-2.4.7-py2.py3-none-any.whl) = acb6b4ff90254d73804621d302926deb69bc99ffde16d7aa16cba7d0af7a53c25b7197d422309d9e82a766704fd7ea4c8b078a48d2e7d8658a8b237266fe24f5
 SHA512 (pyroute2-0.4.13.tar.gz) = 7a86ef38c4892198a29b688b225df9b7fe7761a1685d7bf0430252783d93cfb13a52c82e05ba808f11b82ff3deac178585487eaa3adf77487a4e8402987fe646
 SHA512 (urllib3-1.26.18.tar.gz) = c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@ -1,26 +0,0 @@
 #!/bin/sh
 err=0
 agents=$(pcs resource list ocf:heartbeat 2>&1)
 if [ $(echo "$agents" | wc -l) -lt 2 ]; then
 	echo "ERROR: pcs: agents available:\n$agents"
 	err=$((err+1))
 else
 	echo "INFO: pcs: agents available..."
 fi
 for bin in aliyuncli-ra "gcloud-ra -v"; 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
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,16 +0,0 @@
 - hosts: localhost
  roles:
    - role: standard-test-basic
      tags:
        - classic
        - container
      required_packages:
        - resource-agents
        - resource-agents-aliyun
        - resource-agents-gcp
        - pcs
      tests:
        - subpackage_tests:
            dir: .
            run: ./run_tests.sh