use default branch for auto tests; return correct exit code

Author: saklar13

scripts/cli.py

@@ -1,4 +1,3 @@
-import socket
 import sys
 from pathlib import Path
 
@@ -92,12 +91,9 @@ def trigger_auto_tests(
 @click.option("--tc-password", required=True, help="TeamCity Password")
 def new_trigger_builds(tc_user: str, tc_password: str):
     tc = TeamCity("http://tc", auth=(tc_user, tc_password))  # noqa
-    import rpdb
-
-    ip = socket.gethostbyname(socket.gethostname())
-    click.echo(f"IP: {ip}")
-    rpdb.set_trace("0.0.0.0")
-    new_main(tc_user, tc_password)
+    is_success = new_main(tc_user, tc_password)
+    if not is_success:
+        sys.exit(1)
 
 
 @cli.command(

scripts/trigger_auto_tests/main.py

@@ -37,10 +37,19 @@ def main(tc_user: str, tc_password: str):
     while triggered_builds:
         time.sleep(BUILDS_CHECK_DELAY)
         for shell_name, build_id in triggered_builds.copy().items():
-            build = tc.builds.get(f"id:{build_id}")
-            if is_build_finished(build):
-                builds_statuses[shell_name] = is_build_success(build)
-                triggered_builds.pop(shell_name)
+            try:
+                build = tc.builds.get(f"id:{build_id}")
+                if is_build_finished(build):
+                    click.echo(
+                        f"{shell_name} Automation tests is finished "
+                        f"with status {build.status}"
+                    )
+                    builds_statuses[shell_name] = is_build_success(build)
+                    triggered_builds.pop(shell_name)
+            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())

scripts/trigger_auto_tests/utils/helpers.py

@@ -88,7 +88,7 @@ def trigger_auto_tests_build2(
             ModelProperty("conf.triggered_by_project.commit_id", tests_info.commit_id),
         ]
     )
-    new_build = Build(build_type_id=bt.id, branch_name="master", properties=properties)
+    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