Merge "Don't reconfigure the tenant on tag creation"

1 files changed, 6 insertions, 1 deletions

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 01254f937..cfcc64485 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -1282,12 +1282,17 @@ class Scheduler(threading.Thread):
                 if ((event.branch_updated and
                      hasattr(change, 'files') and
                      change.updatesConfig(tenant)) or
-                    event.branch_created or
                     (event.branch_deleted and
                      self.abide.hasUnparsedBranchCache(event.project_name,
                                                        event.branch))):
                     reconfigure_tenant = True
 
+                # The branch_created attribute is also true when a tag is
+                # created. Since we load config only from branches only trigger
+                # a tenant reconfiguration if the branch is set as well.
+                if event.branch_created and event.branch:
+                    reconfigure_tenant = True
+
                 # If the driver knows the branch but we don't have a config, we
                 # also need to reconfigure. This happens if a GitHub branch
                 # was just configured as protected without a push in between.