diff --git a/.gitignore b/.gitignore index 2a441e4..4e9d322 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /*.src.rpm /.build-*.log /*/ +!/tests/ +/tests/*.retry diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..648918d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/resource-agents-sap.spec b/resource-agents-sap.spec index 7d2b559..b0e7c66 100644 --- a/resource-agents-sap.spec +++ b/resource-agents-sap.spec @@ -48,7 +48,7 @@ Name: resource-agents-sap Summary: SAP cluster resource agents Version: 4.8.0 -Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -176,6 +176,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %exclude /usr/src %changelog +* Tue Jun 22 2021 Oyvind Albrigtsen - 4.8.0-2 +- Add CI gating tests + + Resolves: rhbz#1960245 + * Mon Jun 7 2021 Oyvind Albrigtsen - 4.8.0-1 - Rebase to resource-agents 4.8.0 upstream release. diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100755 index 0000000..ae56ff2 --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,16 @@ +#!/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 + +if [ $err -ge 1 ]; then + echo -e "\nERROR: $err tests FAILED..." + exit 1 +fi diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d7247bb --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,14 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + required_packages: + - resource-agents-sap + - pcs + + tests: + - subpackage_tests: + dir: . + run: ./run_tests.sh