Merge "Fix race in test_timer_multi_scheduler"

tests/fixtures/layouts/timer-jitter-slow.yaml

@@ -0,0 +1,56 @@
+- pipeline:
+    name: check
+    manager: independent
+    trigger:
+      gerrit:
+        - event: patchset-created
+    success:
+      gerrit:
+        Verified: 1
+    failure:
+      gerrit:
+        Verified: -1
+
+- pipeline:
+    name: periodic
+    manager: independent
+    trigger:
+      timer:
+        - time: '* * * * * 1 1'
+
+- job:
+    name: base
+    parent: null
+    run: playbooks/base.yaml
+
+- job:
+    name: project-test1
+    run: playbooks/project-test1.yaml
+
+- job:
+    name: project-test2
+    run: playbooks/project-test2.yaml
+
+- job:
+    name: project-bitrot
+    nodeset:
+      nodes:
+        - name: static
+          label: ubuntu-xenial
+    run: playbooks/project-bitrot.yaml
+
+- project:
+    name: org/project1
+    check:
+      jobs:
+        - project-test1
+
+- project:
+    name: org/project
+    check:
+      jobs:
+        - project-test1
+        - project-test2
+    periodic:
+      jobs:
+        - project-bitrot

tests/unit/test_sos.py

@@ -612,7 +612,7 @@ class TestScaleOutScheduler(ZuulTestCase):
         self.fake_nodepool.unpause()
         self.waitUntilSettled()
 
-    @simple_layout('layouts/timer-jitter.yaml')
+    @simple_layout('layouts/timer-jitter-slow.yaml')
     def test_timer_multi_scheduler(self):
         # Test that two schedulers create exactly the same timer jobs
         # including jitter.