sts-sponsors team mailing list archive

[Adam Collard <mp+437609@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-ci/+git/maas-ci-internal:tweak-job-reviewer into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

Commit message:
[job-reviewer] Don't try to extract commit unnecessarily



Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~adam-collard/maas-ci/+git/maas-ci-internal/+merge/437609
-- 
Your team MAAS Committers is requested to review the proposed merge of ~adam-collard/maas-ci/+git/maas-ci-internal:tweak-job-reviewer into ~maas-committers/maas-ci/+git/maas-ci-internal:main.

diff --git a/jobs/launchpad-ci/launchpad b/jobs/launchpad-ci/launchpad
index 60e04e8..9e4d9a0 100755
--- a/jobs/launchpad-ci/launchpad
+++ b/jobs/launchpad-ci/launchpad
@@ -128,9 +128,9 @@ def should_unconditionally_test(lp, proposal):
     for comment in proposal.all_comments:
         if has_test_marker(comment):
             hit_test_marker = True
-        if lp.me == comment.author:
+        if hit_test_marker and lp.me == comment.author:
             commit = extract_commit_from_comment(comment)
-            if commit and hit_test_marker:
+            if commit:
                 # Test marker was set but a following comment holds a test, so
                 # the test has already been ran for this proposal.
                 hit_test_marker = False