re run failed builds

Author: saklar13

scripts/trigger_auto_tests/main.py

@@ -7,6 +7,7 @@
     AutoTestsInfo,
     is_build_finished,
     is_build_success,
+    is_last_build_successful,
     is_shell_uses_package,
     trigger_auto_tests_build2,
 )
@@ -16,24 +17,59 @@
 
 
 def main(tc_user: str, tc_password: str):
-    triggered_builds: dict[str, int] = {}
-    builds_statuses: dict[str, bool] = {}
     errors = []
+    triggered_builds = {}
     tc = TeamCity(TC_URL, auth=(tc_user, tc_password))
     tests_info = AutoTestsInfo.get_current(tc)
+    if tests_info.re_run_builds:
+        click.echo("Re run failed builds")
+    else:
+        click.echo("Run automated tests")
 
     for shell_name in tests_info.supported_shells:
         try:
-            if is_shell_uses_package(shell_name, tests_info):
-                click.echo(f"{shell_name} Automation tests build triggering")
-                build_id = trigger_auto_tests_build2(tc, shell_name, tests_info)
-                triggered_builds[shell_name] = build_id
-            else:
-                click.echo(f"{shell_name} skipped tests")
+            triggered_builds = _run_tests_for_shell(tc, shell_name, tests_info)
         except Exception as e:
             errors.append(e)
             click.echo(e, err=True)
 
+    builds_statuses, new_errors = _wait_build_finish(tc, triggered_builds)
+    errors.extend(new_errors)
+
+    if errors:
+        raise Exception("There were errors running automation tests.")
+    return all(builds_statuses.values())
+
+
+def _run_tests_for_shell(
+    tc: TeamCity, shell_name: str, tests_info: AutoTestsInfo
+) -> dict[str, int]:
+    triggered_builds = {}
+    if is_shell_uses_package(shell_name, tests_info):
+        if tests_info.re_run_builds:
+            if is_last_build_successful(tc, shell_name, tests_info):
+                click.echo(
+                    f"{shell_name} last auto tests for this package and commit "
+                    f"id was successful, skip it"
+                )
+            else:
+                click.echo(f"{shell_name} Re run automation tests")
+                build_id = trigger_auto_tests_build2(tc, shell_name, tests_info)
+                triggered_builds[shell_name] = build_id
+        else:
+            click.echo(f"{shell_name} Automation tests build triggering")
+            build_id = trigger_auto_tests_build2(tc, shell_name, tests_info)
+            triggered_builds[shell_name] = build_id
+    else:
+        click.echo(f"{shell_name} is not uses package with this version, skipped tests")
+    return triggered_builds
+
+
+def _wait_build_finish(
+    tc: TeamCity, triggered_builds: dict[str, int]
+) -> tuple[dict[str, bool], list[Exception]]:
+    builds_statuses = {}
+    errors = []
     while triggered_builds:
         time.sleep(BUILDS_CHECK_DELAY)
         for shell_name, build_id in triggered_builds.copy().items():
@@ -49,7 +85,4 @@ def main(tc_user: str, tc_password: str):
             except Exception as e:
                 errors.append(e)
                 click.echo(e, err=True)
-
-    if errors:
-        raise Exception("There were errors running automation tests.")
-    return all(builds_statuses.values())
+    return builds_statuses, errors

scripts/trigger_auto_tests/utils/helpers.py

@@ -1,7 +1,7 @@
 import os
 from pathlib import Path, PosixPath
 
-from dohq_teamcity import Build, ModelProperty, Properties, TeamCity
+from dohq_teamcity import Build, BuildType, ModelProperty, Properties, TeamCity
 from dohq_teamcity.rest import RESTClientObject
 from github import Github, Repository, UnknownObjectException
 from pip_download import PipDownloader
@@ -94,6 +94,26 @@ def trigger_auto_tests_build2(
     return build.id
 
 
+def is_last_build_successful(
+    tc: TeamCity, shell_name: str, tests_info: "AutoTestsInfo"
+) -> bool:
+    bt: BuildType = tc.projects.get_build_type(
+        project_locator=f"id:{tests_info.automation_project_id}",
+        bt_locator=f"name:{shell_name}",
+    )
+    for build in bt.get_builds():
+        params = get_build_params(build)
+        if (
+            params["conf.triggered_by_project.url"] == tests_info.vcs_url
+            and params["conf.triggered_by_project.commit_id"] == tests_info.commit_id
+        ):
+            is_success = is_build_success(build)
+            break
+    else:
+        is_success = False
+    return is_success
+
+
 def is_build_finished(build: Build) -> bool:
     return build.state.lower() == "finished"
 
@@ -108,6 +128,10 @@ def update_tc_csrf(tc: TeamCity):
     tc.rest_client = RESTClientObject(tc.configuration)
 
 
+def get_build_params(build: Build) -> dict:
+    return {pr.name: pr.value for pr in build.get_build_actual_parameters()}
+
+
 class AutoTestsInfo(BaseModel):
     number: int
     params: dict
@@ -117,6 +141,7 @@ class AutoTestsInfo(BaseModel):
     name: str
     supported_shells: list[str]
     automation_project_id: str
+    re_run_builds: bool
 
     @classmethod
     def get_current(cls, tc: TeamCity) -> "AutoTestsInfo":
@@ -131,13 +156,14 @@ def get_current(cls, tc: TeamCity) -> "AutoTestsInfo":
         build = bt.get_builds(
             locator=f"number:{number},branch:(unspecified:any),running:true"
         )[0]
-        params = {pr.name: pr.value for pr in build.get_build_actual_parameters()}
+        params = get_build_params(build)
         vcs_url = params["vcsroot.url"]
         path = PosixPath(params["teamcity.build.checkoutDir"])
         supported_shells = list(
             filter(bool, map(str.strip, params["conf.shells"].split(";")))
         )
         automation_project_id = params["automation.project.id"]
+        re_run_builds = params["re-run-builds"]
         return cls(
             number=int(number),
             params=params,
@@ -147,4 +173,5 @@ def get_current(cls, tc: TeamCity) -> "AutoTestsInfo":
             name=name,
             supported_shells=supported_shells,
             automation_project_id=automation_project_id,
+            re_run_builds=re_run_builds,
         )