[FIX] Temporary Solution(Bot Comments) - Move code to update avg. time at last (#829)

Author: Tarun-Arora

mod_ci/controllers.py

@@ -1244,8 +1244,76 @@ def progress_type_request(log, test, test_id, request) -> bool:
             commit.value = test.commit
             g.db.commit()
 
+    # Post status update
+    state = Status.PENDING
+    target_url = url_for('test.by_id', test_id=test.id, _external=True)
+    context = f"CI - {test.platform.value}"
+
+    if status == TestStatus.canceled:
+        state = Status.ERROR
+        message = 'Tests aborted due to an error; please check'
+
+    elif status == TestStatus.completed:
+        # Determine if success or failure
+        # It fails if any of these happen:
+        # - A crash (unexpected exit code)
+        # - A not None value on the "got" of a TestResultFile (
+        #       meaning the hashes do not match)
+        crashes = g.db.query(count(TestResult.exit_code)).filter(
+            and_(
+                TestResult.test_id == test.id,
+                TestResult.exit_code != TestResult.expected_rc
+            )).scalar()
+        results_zero_rc = g.db.query(RegressionTest.id).filter(
+            RegressionTest.expected_rc == 0
+        ).subquery()
+        results = g.db.query(count(TestResultFile.got)).filter(
+            and_(
+                TestResultFile.test_id == test.id,
+                TestResultFile.regression_test_id.in_(results_zero_rc),
+                TestResultFile.got.isnot(None)
+            )
+        ).scalar()
+        log.debug(f'[Test: {test.id}] Test completed: {crashes} crashes, {results} results')
+        if crashes > 0 or results > 0:
+            state = Status.FAILURE
+            message = 'Not all tests completed successfully, please check'
+
+        else:
+            state = Status.SUCCESS
+            message = 'Tests completed'
+        if test.test_type == TestType.pull_request:
+            comment_pr(test.id, state, test.pr_nr, test.platform.name)
+        update_build_badge(state, test)
+
+    else:
+        message = progress.message
+
+    gh_commit = repository.get_commit(test.commit)
+    try:
+        gh_commit.create_status(state=state, description=message, context=context, target_url=target_url)
+    except GithubException as a:
+        log.error(f'Got an exception while posting to GitHub! Message: {a.data}')
+
+    if status in [TestStatus.completed, TestStatus.canceled]:
+        # Delete the current instance
+        from run import config
+        compute = get_compute_service_object()
+        zone = config.get('ZONE', '')
+        project = config.get('PROJECT_NAME', '')
+        vm_name = f"{test.platform.value}-{test.id}"
+        operation = delete_instance(compute, project, zone, vm_name)
+        wait_for_operation(compute, project, zone, operation['name'])
+
     # If status is complete, remove the GCP Instance entry
     if status in [TestStatus.completed, TestStatus.canceled]:
+        gcp_instance = GcpInstance.query.filter(GcpInstance.test_id == test_id).first()
+
+        if gcp_instance is not None:
+            log.debug(f"Removing GCP Instance entry: {gcp_instance}")
+            g.db.delete(gcp_instance)
+            g.db.commit()
+
         log.debug(f"[Test: {test_id}] Test {status}")
         var_average = 'average_time_' + test.platform.value
         current_average = GeneralData.query.filter(GeneralData.key == var_average).first()
@@ -1307,74 +1375,6 @@ def progress_type_request(log, test, test_id, request) -> bool:
             g.db.commit()
             log.info(f'average time updated to {str(current_average.value)}')
 
-        gcp_instance = GcpInstance.query.filter(GcpInstance.test_id == test_id).first()
-
-        if gcp_instance is not None:
-            log.debug(f"Removing GCP Instance entry: {gcp_instance}")
-            g.db.delete(gcp_instance)
-            g.db.commit()
-
-    # Post status update
-    state = Status.PENDING
-    target_url = url_for('test.by_id', test_id=test.id, _external=True)
-    context = f"CI - {test.platform.value}"
-
-    if status == TestStatus.canceled:
-        state = Status.ERROR
-        message = 'Tests aborted due to an error; please check'
-
-    elif status == TestStatus.completed:
-        # Determine if success or failure
-        # It fails if any of these happen:
-        # - A crash (unexpected exit code)
-        # - A not None value on the "got" of a TestResultFile (
-        #       meaning the hashes do not match)
-        crashes = g.db.query(count(TestResult.exit_code)).filter(
-            and_(
-                TestResult.test_id == test.id,
-                TestResult.exit_code != TestResult.expected_rc
-            )).scalar()
-        results_zero_rc = g.db.query(RegressionTest.id).filter(
-            RegressionTest.expected_rc == 0
-        ).subquery()
-        results = g.db.query(count(TestResultFile.got)).filter(
-            and_(
-                TestResultFile.test_id == test.id,
-                TestResultFile.regression_test_id.in_(results_zero_rc),
-                TestResultFile.got.isnot(None)
-            )
-        ).scalar()
-        log.debug(f'[Test: {test.id}] Test completed: {crashes} crashes, {results} results')
-        if crashes > 0 or results > 0:
-            state = Status.FAILURE
-            message = 'Not all tests completed successfully, please check'
-
-        else:
-            state = Status.SUCCESS
-            message = 'Tests completed'
-        if test.test_type == TestType.pull_request:
-            comment_pr(test.id, state, test.pr_nr, test.platform.name)
-        update_build_badge(state, test)
-
-    else:
-        message = progress.message
-
-    gh_commit = repository.get_commit(test.commit)
-    try:
-        gh_commit.create_status(state=state, description=message, context=context, target_url=target_url)
-    except GithubException as a:
-        log.error(f'Got an exception while posting to GitHub! Message: {a.data}')
-
-    if status in [TestStatus.completed, TestStatus.canceled]:
-        # Delete the current instance
-        from run import config
-        compute = get_compute_service_object()
-        zone = config.get('ZONE', '')
-        project = config.get('PROJECT_NAME', '')
-        vm_name = f"{test.platform.value}-{test.id}"
-        operation = delete_instance(compute, project, zone, vm_name)
-        wait_for_operation(compute, project, zone, operation['name'])
-
     return True