From f2837569f57712a3d6edd849748ba4028bd4f4c3 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 30 Sep 2021 14:26:46 +0300
Subject: [PATCH] Fixes in termination lambda

---
 tests/ci/run_check.py              |  5 ++++-
 tests/ci/termination_lambda/app.py | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index 70b3ae2ac07..95e827671ca 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -86,7 +86,7 @@ def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
 # can be skipped entirely.
 def should_run_checks_for_pr(pr_info):
     # Consider the labels and whether the user is trusted.
-    force_labels = set(['force tests', 'release']).intersection(pr_info.labels)
+    force_labels = set(['force tests']).intersection(pr_info.labels)
     if force_labels:
         return True, "Labeled '{}'".format(', '.join(force_labels))
 
@@ -96,6 +96,9 @@ def should_run_checks_for_pr(pr_info):
     if 'can be tested' not in pr_info.labels and not pr_is_by_trusted_user(pr_info.user_login, pr_info.user_orgs):
         return False, "Needs 'can be tested' label"
 
+    if 'release' in pr_info.labels or 'pr-backport' in pr_info.labels or 'pr-cherrypick' in pr_info.labels:
+        return False, "Don't try new checks for release/backports/cherry-picks"
+
     return True, "No special conditions apply"
 
 def get_commit(gh, commit_sha):
diff --git a/tests/ci/termination_lambda/app.py b/tests/ci/termination_lambda/app.py
index 261403dd8be..7fd7c400db9 100644
--- a/tests/ci/termination_lambda/app.py
+++ b/tests/ci/termination_lambda/app.py
@@ -162,8 +162,16 @@ def main(github_secret_key, github_app_id, event):
 
         delete_for_av = []
         for candidate in candidates:
-            if len(delete_for_av) == num_to_kill:
+            if candidate not in set([runner.name for runner in runners]):
+                print(f"Candidate {candidate} was not in runners list, simply delete it")
+                instances_to_kill.append(candidate)
+
+        for candidate in candidates:
+            if len(delete_for_av) + len(instances_to_kill) == num_to_kill:
                 break
+            if candidate in instances_to_kill:
+                continue
+
             for runner in runners:
                 if runner.name == candidate:
                     if not runner.busy:
@@ -172,9 +180,6 @@ def main(github_secret_key, github_app_id, event):
                     else:
                         print(f"Runner {runner.name} is busy, not going to delete it")
                     break
-            else:
-                print(f"Candidate {candidate} was not in runners list, simply delete it")
-                instances_to_kill.append(candidate)
 
         if len(delete_for_av) < num_to_kill:
             print(f"Checked all candidates for av {zone}, get to delete {len(delete_for_av)}, but still cannot get required {num_to_kill}")
@@ -189,9 +194,9 @@ def main(github_secret_key, github_app_id, event):
         else:
             print(f"Cannot delete {runner.name} from github")
 
-    # push metrics
-    runners = list_runners(access_token)
-    push_metrics_to_cloudwatch(runners, 'RunnersMetrics')
+    ## push metrics
+    #runners = list_runners(access_token)
+    #push_metrics_to_cloudwatch(runners, 'RunnersMetrics')
 
     response = {
         "InstanceIDs": instances_to_kill
@@ -262,7 +267,7 @@ if __name__ == "__main__":
                 "InstanceId": "ip-172-31-45-253.eu-west-1.compute.internal",
                 "InstanceType": "t2.nano",
                 "InstanceMarketOption": "OnDemand"
-            },
+            }
         ],
         "Cause": "SCALE_IN"
     }