Merge pull request #6794 from readthedocs/humitos/start-time-from-beginning

Do not reset the build start time when running build env

Author: humitos

readthedocs/doc_builder/environments.py

@@ -548,6 +548,7 @@ def __init__(
             record=True,
             environment=None,
             update_on_success=True,
+            start_time=None,
     ):
         super().__init__(project, environment)
         self.version = version
@@ -557,7 +558,7 @@ def __init__(
         self.update_on_success = update_on_success
 
         self.failure = None
-        self.start_time = datetime.utcnow()
+        self.start_time = start_time or datetime.utcnow()
 
     def __enter__(self):
         return self

readthedocs/projects/tasks.py

@@ -474,6 +474,7 @@ def __init__(
         if config is not None:
             self.config = config
         self.task = task
+        self.build_start_time = None
         # TODO: remove this
         self.setup_env = None
 
@@ -578,6 +579,7 @@ def run_setup(self, record=True):
             update_on_success=False,
             environment=self.get_rtd_env_vars(),
         )
+        self.build_start_time = environment.start_time
 
         # TODO: Remove.
         # There is code that still depends of this attribute
@@ -668,6 +670,9 @@ def run_build(self, record):
             build=self.build,
             record=record,
             environment=env_vars,
+
+            # Pass ``start_time`` here to not reset the timer
+            start_time=self.build_start_time,
         )
 
         # Environment used for building code, usually with Docker