Move CustomReposAreValid to pre_ponr_changes stage

Moving the CustomReposAreValid to pre_ponr_changes to be a dependency of SUBSCRIBE_SYSTEM.
oamg · Sep 12, 2024 · 8ba6221 · 8ba6221
1 parent 81b0255
commit 8ba6221
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...s/system_checks/custom_repos_are_valid.py → ...re_ponr_changes/custom_repos_are_valid.py b/...s/system_checks/custom_repos_are_valid.py → ...re_ponr_changes/custom_repos_are_valid.py
@@ -27,6 +27,7 @@
 
 class CustomReposAreValid(actions.Action):
     id = "CUSTOM_REPOSITORIES_ARE_VALID"
+    dependencies = ("SUBSCRIBE_SYSTEM",)
 
     def run(self):
         """To prevent failures past the PONR, make sure that the enabled custom repositories are valid.
@@ -38,7 +39,7 @@ def run(self):
         logger.task("Prepare: Check if --enablerepo repositories are accessible")
 
         if not tool_opts.enablerepo:
-            logger.info("Skipping the check as there was no --enablerepo option detected in the command-line.")
+            logger.info("Did not perform the check of repositories due to the use of RHSM for the conversion.")
             return
 
         output, ret_code = call_yum_cmd(

diff --git a/...tem_checks/custom_repos_are_valid_test.py → ...nr_changes/custom_repos_are_valid_test.py b/...tem_checks/custom_repos_are_valid_test.py → ...nr_changes/custom_repos_are_valid_test.py
@@ -20,7 +20,7 @@
 import pytest
 
 from convert2rhel import unit_tests
-from convert2rhel.actions.system_checks import custom_repos_are_valid
+from convert2rhel.actions.pre_ponr_changes import custom_repos_are_valid
 
 
 @pytest.fixture
@@ -68,6 +68,6 @@ def test_custom_repos_are_valid_skip(custom_repos_are_valid_action, monkeypatch,
     custom_repos_are_valid_action.run()
 
     assert (
-        "Skipping the check as there was no --enablerepo option detected in the command-line."
+        "Did not perform the check of repositories due to the use of RHSM for the conversion."
         in caplog.records[-1].message
     )