- Update CI gating

Resolves: rhbz#1977208
This commit is contained in:
Oyvind Albrigtsen 2021-07-28 10:36:15 +02:00
parent a3f87aa3fe
commit 3e6f535e43
3 changed files with 14 additions and 13 deletions

View File

@ -45,7 +45,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.8.0 Version: 4.8.0
Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -422,7 +422,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%changelog %changelog
* Tue Jun 29 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.8.0-6 * Tue Jun 29 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.8.0-7
- Exclude SAP agents that are in separate -sap subpackage - Exclude SAP agents that are in separate -sap subpackage
Resolves: rhbz#1977208 Resolves: rhbz#1977208

View File

@ -10,15 +10,16 @@ else
echo "INFO: pcs: agents available..." echo "INFO: pcs: agents available..."
fi fi
for bin in aliyuncli-ra "gcloud-ra -v"; do # skip until these are added
output="$($bin 2>&1)" #for bin in aliyuncli-ra "gcloud-ra -v"; do
if [ $? -ne 0 ]; then # output="$($bin 2>&1)"
echo -e "ERROR: $bin failed:\n$output" # if [ $? -ne 0 ]; then
err=$((err+1)) # echo -e "ERROR: $bin failed:\n$output"
else # err=$((err+1))
echo "INFO: $bin works..." # else
fi # echo "INFO: $bin works..."
done # fi
#done
if [ $err -ge 1 ]; then if [ $err -ge 1 ]; then
echo -e "\nERROR: $err tests FAILED..." echo -e "\nERROR: $err tests FAILED..."

View File

@ -6,8 +6,8 @@
- container - container
required_packages: required_packages:
- resource-agents - resource-agents
- resource-agents-aliyun - resource-agents-paf
- resource-agents-gcp - ha-cloud-support
- pcs - pcs
tests: tests: