panel/src/panel/settings.py

@@ -223,10 +223,6 @@ LOGGING = {
     },
 }
 
-SECONDS_PER_MINUTE = 60
-DEPLOY_TIMEOUT_MINUTES = 25
-DEPLOY_TIMEOUT_SECONDS = DEPLOY_TIMEOUT_MINUTES * SECONDS_PER_MINUTE
-
 # Customization via user settings
 # This must be at the end, as it must be able to override the above
 # TODO(@fricklerhandwerk):

panel/src/panel/views.py

@@ -1,7 +1,6 @@
 from enum import Enum
 import json
 from os.path import expanduser
-from subprocess import Popen, PIPE, STDOUT
 import subprocess
 import logging
 import os
@@ -161,11 +160,6 @@ class DeploymentStatus(ConfigurationForm):
             "--auto-approve",
             "-lock=false",
         ]
-        popen = Popen(cmd, cwd=cwd, env=env, stdout=PIPE, stderr=STDOUT)
-        with popen.stdout:
-            for line in iter(popen.stdout.readline, b''):
-                logger.info(line.decode('utf-8').strip())
-        # FIXME catch subprocess.TimeoutExpired
-        deployment_result = popen.wait(timeout=settings.DEPLOY_TIMEOUT_SECONDS)
-        logger.info(f"deployment_result: {deployment_result}")
+        deployment_result = subprocess.run(cmd, cwd=cwd, env=env)
+        logging.info(deployment_result)
         return deployment_result, deployment_params