debugging

Author: BarkinKctp

packaging_automation/citus_package.py

@@ -242,7 +242,7 @@ def sign_packages(
         print(f"Result:{output}")
 
         if result.returncode != 0:
-            raise ValueError(f"Error while signing rpm files.Err:{result.stderr}")
+            raise ValueError(f"Error while signing rpm files.Err:{result.stdout}")
         if input_output_parameters.output_validation:
             validate_output(
                 output,
@@ -351,21 +351,18 @@ def build_package(
         f"{input_output_parameters.input_files_dir}:/buildfiles:ro "
         f"-e GITHUB_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE -e CONTAINER_BUILD_RUN_ENABLED "
         f"-e MSRUSTUP_PAT -e CRATES_IO_MIRROR_FEED_TOKEN -e INSTALL_RUST -e CI "
-        f"citus/{docker_image_name}:{docker_platform}-{postgres_extension} {build_type.name} 2>&1"
+        f"citus/{docker_image_name}:{docker_platform}-{postgres_extension} {build_type.name}"
     )
 
     print(f"Executing docker command: {docker_command}")
     output = run_with_output(docker_command, text=True)
 
-    if output.stdout:
-        print("Output:" + output.stdout)
     if output.returncode != 0:
         raise ValueError(
             "Docker command failed.\n"
             f"Command: {docker_command}\n"
             f"Exit code: {output.returncode}\n"
-            f"--- stdout ---\n{output.stdout}\n"
-            f"--- stderr ---\n{output.stderr}\n"
+            f"--- combined output (stdout+stderr) ---\n{output.stdout}\n"
         )
 
     if input_output_parameters.output_validation:

packaging_automation/common_tool_methods.py

@@ -166,7 +166,13 @@ def run_with_output(command, *args, **kwargs):
     # this method's main objective is to return output. Therefore it is caller's responsibility to handle
     # success status
     # pylint: disable=subprocess-run-check
-    result = subprocess.run(shlex.split(command), *args, capture_output=True, **kwargs)
+    result = subprocess.run(
+        shlex.split(command),
+        *args,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        **kwargs
+    )
     return result