leapp-repository/SOURCES/0052-Makefile-Make-sanity-check-respect-REPOSITORIES.patch
2025-12-01 09:14:24 +00:00

40 lines
1.5 KiB
Diff

From d9fe5528d6e92702e2188ee28f2620275d032d53 Mon Sep 17 00:00:00 2001
From: Matej Matuska <mmatuska@redhat.com>
Date: Mon, 11 Aug 2025 14:32:16 +0200
Subject: [PATCH 52/55] Makefile: Make sanity-check respect $(REPOSITORIES)
Since b6e84f7, the sanity check, runs in each repository and doesn't
respect $(REPOSITORIES). This breaks the sanity-check when it's run with
a version of Python which is incompatible with the code in particular
repository.
For example with python3.6 and el9toel10 repo, python crashes with the
following because python3.6 doesn't understand the type hint:
File "/payload/repos/system_upgrade/el9toel10/actors/mysql/scanmysql/libraries/scanmysql.py", line 35, in <module>
def _check_incompatible_config() -> set[str]:
TypeError: 'type' object is not subscriptable
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 64115006..b1d807e1 100644
--- a/Makefile
+++ b/Makefile
@@ -373,9 +373,9 @@ lint_fix:
test_no_lint:
@. $(VENVNAME)/bin/activate; \
snactor repo find --path repos/; \
- for dir in repos/system_upgrade/*/; do \
- echo "Running sanity-check in $$dir"; \
- (cd $$dir && snactor workflow sanity-check ipu); \
+ for dir in $$(echo $(REPOSITORIES) | tr "," " "); do \
+ echo "Running sanity-check in $(_SYSUPG_REPOS)/$$dir"; \
+ (cd $(_SYSUPG_REPOS)/$$dir && snactor workflow sanity-check ipu); \
done; \
$(_PYTHON_VENV) -m pytest $(REPORT_ARG) $(TEST_PATHS) $(LIBRARY_PATH) $(PYTEST_ARGS)
--
2.51.1