From 5cd73ad9460d52c055549ddb4d7c41ea2b600956 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 13 Apr 2023 11:03:34 +0300 Subject: [PATCH] Don't fail cross-distro.sh on nightly CI pipeline when it discovers "missing distros" b/c this check isn't suitable for downstream RHEL anyway. See comment in script for more details! Related: COMPOSER-1943 --- test/cases/cross-distro.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/cases/cross-distro.sh b/test/cases/cross-distro.sh index 9c9cc2a89..3bf2894de 100755 --- a/test/cases/cross-distro.sh +++ b/test/cases/cross-distro.sh @@ -115,7 +115,14 @@ if [ "$ALL_EXPECTED_DISTROS" != "$INSTALLED_DISTROS" ];then echo "Some distros are missing!" echo "Missing distros:" diff <(echo "${ALL_EXPECTED_DISTROS}") <(echo "${INSTALLED_DISTROS}") | grep "<" | sed 's/^<\ //g' - exit 1 + + # the check above compares repositories/*.json files from git checkout + # vs the files installed from an RPM package in order to find files which are + # not included in the RPM. Don't fail when running on nightly CI pipeline b/c + # very often the repository will be newer than the downstream RPM. + if [[ "${CI_PIPELINE_SOURCE:-}" != "schedule" ]]; then + exit 1 + fi fi # Push a blueprint with unsupported distro to see if composer fails gracefuly