Use all existing RHC_WORKER variables for script (#66)

Signed-off-by: Andrea Waltlova <awaltlov@redhat.com>
oamg · Mar 12, 2024 · be1b37c · be1b37c
1 parent cce38b8
commit be1b37c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/scripts/c2r_script.py b/scripts/c2r_script.py
@@ -491,10 +491,10 @@ def run_convert2rhel():
     print("Running Convert2RHEL %s" % SCRIPT_TYPE.title())
     env = {"PATH": os.environ["PATH"]}
 
-    if "RHC_WORKER_CONVERT2RHEL_DISABLE_TELEMETRY" in os.environ:
-        env["CONVERT2RHEL_DISABLE_TELEMETRY"] = os.environ[
-            "RHC_WORKER_CONVERT2RHEL_DISABLE_TELEMETRY"
-        ]
+    for key, value in os.environ.items():
+        valid_prefix = "RHC_WORKER_"
+        if key.startswith(valid_prefix):
+            env[key.replace(valid_prefix, "")] = value
 
     command = ["/usr/bin/convert2rhel"]
     if IS_ANALYSIS:

diff --git a/tests/test_run.py b/tests/test_run.py
@@ -5,7 +5,11 @@
 
 @patch("scripts.c2r_script.SCRIPT_TYPE", "CONVERSION")
 def test_run_convert2rhel_conversion():
-    mock_env = {"PATH": "/fake/path", "RHC_WORKER_CONVERT2RHEL_DISABLE_TELEMETRY": "1"}
+    mock_env = {
+        "PATH": "/fake/path",
+        "RHC_WORKER_CONVERT2RHEL_DISABLE_TELEMETRY": "1",
+        "RHC_WORKER_FOO": "1",
+    }
 
     with patch("os.environ", mock_env), patch(
         "scripts.c2r_script.run_subprocess", return_value=(b"", 0)
@@ -14,7 +18,11 @@ def test_run_convert2rhel_conversion():
 
     mock_popen.assert_called_once_with(
         ["/usr/bin/convert2rhel", "-y"],
-        env={"PATH": "/fake/path", "CONVERT2RHEL_DISABLE_TELEMETRY": "1"},
+        env={
+            "PATH": "/fake/path",
+            "CONVERT2RHEL_DISABLE_TELEMETRY": "1",
+            "FOO": "1",
+        },
     )