print build url

Author: saklar13

scripts/trigger_auto_tests/main.py

@@ -12,7 +12,7 @@
     is_build_success,
     is_last_build_successful,
     is_shell_uses_package,
-    trigger_auto_tests_build2,
+    trigger_auto_tests_build,
 )
 
 TC_URL = "http://tc"
@@ -58,18 +58,21 @@ def _run_tests_for_shell(
     build_id = None
     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):
+            success, build_url = is_last_build_successful(tc, shell_name, tests_info)
+            if success:
                 tc_msg.testIgnored(
                     shell_name,
                     f"{shell_name} last auto tests for this package and commit "
-                    f"id was successful, skip it",
+                    f"id was successful, skip it. {build_url}",
                 )
             else:
-                click.echo(f"{shell_name} Re run automation tests")
-                build_id = trigger_auto_tests_build2(tc, shell_name, tests_info)
+                build_id, build_url = trigger_auto_tests_build(
+                    tc, shell_name, tests_info
+                )
+                click.echo(f"{shell_name} Re run automation tests. {build_url}")
         else:
-            click.echo(f"{shell_name} Automation tests build triggering")
-            build_id = trigger_auto_tests_build2(tc, shell_name, tests_info)
+            build_id, build_url = trigger_auto_tests_build(tc, shell_name, tests_info)
+            click.echo(f"{shell_name} Automation tests build triggered. {build_url}")
     else:
         tc_msg.testIgnored(
             shell_name,

scripts/trigger_auto_tests/utils/helpers.py

@@ -7,8 +7,6 @@
 from pip_download import PipDownloader
 from pydantic import BaseModel
 
-from scripts.trigger_auto_tests.utils.tc_api import TeamCityAPI
-
 REPOS_OWNER = "QualiSystems"
 
 
@@ -47,37 +45,10 @@ def is_shell_uses_package(shell_name: str, tests_info: "AutoTestsInfo") -> bool:
 
 
 def trigger_auto_tests_build(
-    tc_api: TeamCityAPI,
-    shell_name: str,
-    automation_project_id: str,
-    package_vcs_url: str,
-    package_commit_id: str,
-) -> int:
-    locator_data = {
-        "name": shell_name,
-        "project": automation_project_id,
-    }
-    additional_data = {
-        "triggeringOptions": {"queueAtTop": True},
-        "properties": {
-            "property": [
-                {"name": "conf.triggered_by_project.url", "value": package_vcs_url},
-                {
-                    "name": "conf.triggered_by_project.commit_id",
-                    "value": package_commit_id,
-                },
-            ]
-        },
-    }
-    data = tc_api.trigger_builds(locator_data, additional_data=additional_data)
-    return data.id
-
-
-def trigger_auto_tests_build2(
     tc: TeamCity,
     shell_name: str,
     tests_info: "AutoTestsInfo",
-) -> int:
+) -> tuple[int, str]:
     bt = tc.projects.get_build_type(
         project_locator=f"id:{tests_info.automation_project_id}",
         bt_locator=f"name:{shell_name}",
@@ -91,27 +62,29 @@ def trigger_auto_tests_build2(
     new_build = Build(build_type_id=bt.id, properties=properties)
     update_tc_csrf(tc)
     build = tc.build_queues.queue_new_build(body=new_build, move_to_top=True)
-    return build.id
+    return build.id, build.web_url
 
 
 def is_last_build_successful(
     tc: TeamCity, shell_name: str, tests_info: "AutoTestsInfo"
-) -> bool:
+) -> tuple[bool, str]:
     bt: BuildType = tc.projects.get_build_type(
         project_locator=f"id:{tests_info.automation_project_id}",
         bt_locator=f"name:{shell_name}",
     )
+    build_url = ""
     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)
+            build_url = build.web_url
             break
     else:
         is_success = False
-    return is_success
+    return is_success, build_url
 
 
 def is_build_finished(build: Build) -> bool:

version.txt

@@ -1 +1 @@
-3.0.2
+3.0.3