blob: a97e47ef45d8db7573d7c46a8d4023373d43e45a [file] [log] [blame]
James E. Blairb0fcae42012-07-17 11:12:10 -07001#!/usr/bin/env python
2
3# Copyright 2012 Hewlett-Packard Development Company, L.P.
4#
5# Licensed under the Apache License, Version 2.0 (the "License"); you may
6# not use this file except in compliance with the License. You may obtain
7# a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14# License for the specific language governing permissions and limitations
15# under the License.
16
James E. Blaira002b032017-04-18 10:35:48 -070017import gc
James E. Blairb0fcae42012-07-17 11:12:10 -070018import json
Tobias Henkel9a0e1942017-03-20 16:16:02 +010019import textwrap
20
Monty Taylorbc758832013-06-17 17:22:42 -040021import os
James E. Blairb0fcae42012-07-17 11:12:10 -070022import re
James E. Blair4886cc12012-07-18 15:39:41 -070023import shutil
Monty Taylorbc758832013-06-17 17:22:42 -040024import time
Clint Byrum03454a52017-05-26 17:14:02 -070025from unittest import skip
Monty Taylorbc758832013-06-17 17:22:42 -040026
James E. Blair4886cc12012-07-18 15:39:41 -070027import git
Monty Taylorbc758832013-06-17 17:22:42 -040028import testtools
Monty Taylorb934c1a2017-06-16 19:31:47 -050029import urllib
James E. Blairb0fcae42012-07-17 11:12:10 -070030
Maru Newby3fe5f852015-01-13 04:22:14 +000031import zuul.change_matcher
Clint Byrumb9de8be2017-05-27 13:49:19 -070032from zuul.driver.gerrit import gerritreporter
James E. Blairb0fcae42012-07-17 11:12:10 -070033import zuul.scheduler
James E. Blairad28e912013-11-27 10:43:22 -080034import zuul.rpcclient
Paul Belanger9bba4902016-11-02 16:07:33 -040035import zuul.model
James E. Blairb0fcae42012-07-17 11:12:10 -070036
Maru Newby3fe5f852015-01-13 04:22:14 +000037from tests.base import (
Paul Belanger0a21f0a2017-06-13 13:14:42 -040038 SSLZuulTestCase,
Maru Newby3fe5f852015-01-13 04:22:14 +000039 ZuulTestCase,
40 repack_repo,
James E. Blair06cc3922017-04-19 10:08:10 -070041 simple_layout,
Maru Newby3fe5f852015-01-13 04:22:14 +000042)
James E. Blairb0fcae42012-07-17 11:12:10 -070043
James E. Blairb0fcae42012-07-17 11:12:10 -070044
Paul Belanger0a21f0a2017-06-13 13:14:42 -040045class TestSchedulerSSL(SSLZuulTestCase):
46 tenant_config_file = 'config/single-tenant/main.yaml'
47
48 def test_jobs_executed(self):
49 "Test that jobs are executed and a change is merged"
Paul Belanger0a21f0a2017-06-13 13:14:42 -040050 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +020051 A.addApproval('Code-Review', 2)
52 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Paul Belanger0a21f0a2017-06-13 13:14:42 -040053 self.waitUntilSettled()
54 self.assertEqual(self.getJobFromHistory('project-merge').result,
55 'SUCCESS')
56 self.assertEqual(self.getJobFromHistory('project-test1').result,
57 'SUCCESS')
58 self.assertEqual(self.getJobFromHistory('project-test2').result,
59 'SUCCESS')
60 self.assertEqual(A.data['status'], 'MERGED')
61 self.assertEqual(A.reported, 2)
62 self.assertEqual(self.getJobFromHistory('project-test1').node,
63 'label1')
James E. Blairfcbf95d2017-07-25 16:38:09 -070064 self.assertEqual(self.getJobFromHistory('project-test2').node,
65 'label1')
Paul Belanger0a21f0a2017-06-13 13:14:42 -040066
67
Clark Boylanb640e052014-04-03 16:41:46 -070068class TestScheduler(ZuulTestCase):
James E. Blair552b54f2016-07-22 13:55:32 -070069 tenant_config_file = 'config/single-tenant/main.yaml'
Antoine Mussobd86a312014-01-08 14:51:33 +010070
Paul Belanger174a8272017-03-14 13:20:10 -040071 def test_jobs_executed(self):
72 "Test that jobs are executed and a change is merged"
James E. Blair1f4c2bb2013-04-26 08:40:46 -070073
James E. Blairb0fcae42012-07-17 11:12:10 -070074 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +020075 A.addApproval('Code-Review', 2)
76 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blairb0fcae42012-07-17 11:12:10 -070077 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -040078 self.assertEqual(self.getJobFromHistory('project-merge').result,
79 'SUCCESS')
80 self.assertEqual(self.getJobFromHistory('project-test1').result,
81 'SUCCESS')
82 self.assertEqual(self.getJobFromHistory('project-test2').result,
83 'SUCCESS')
84 self.assertEqual(A.data['status'], 'MERGED')
85 self.assertEqual(A.reported, 2)
James E. Blair34776ee2016-08-25 13:53:54 -070086 self.assertEqual(self.getJobFromHistory('project-test1').node,
James E. Blair16d96a02017-06-08 11:32:56 -070087 'label1')
James E. Blairfcbf95d2017-07-25 16:38:09 -070088 self.assertEqual(self.getJobFromHistory('project-test2').node,
89 'label1')
James E. Blairb0fcae42012-07-17 11:12:10 -070090
James E. Blair80ac1582017-10-09 07:02:40 -070091 for stat in self.statsd.stats:
92 k, v = stat.decode('utf-8').split(':')
93 self.log.debug('stat %s:%s', k, v)
James E. Blair552b54f2016-07-22 13:55:32 -070094 # TODOv3(jeblair): we may want to report stats by tenant (also?).
Monty Taylorf1385042017-05-27 12:25:05 -050095 # Per-driver
96 self.assertReportedStat('zuul.event.gerrit.comment-added', value='1|c')
97 # Per-driver per-connection
98 self.assertReportedStat('zuul.event.gerrit.gerrit.comment-added',
99 value='1|c')
James E. Blair412e5582013-04-22 15:50:12 -0700100 self.assertReportedStat(
James E. Blair80ac1582017-10-09 07:02:40 -0700101 'zuul.tenant.tenant-one.pipeline.gate.current_changes',
102 value='1|g')
James E. Blair412e5582013-04-22 15:50:12 -0700103 self.assertReportedStat(
James E. Blair80ac1582017-10-09 07:02:40 -0700104 'zuul.tenant.tenant-one.pipeline.gate.project.review_example_com.'
105 'org_project.master.job.project-merge.SUCCESS', kind='ms')
106 self.assertReportedStat(
107 'zuul.tenant.tenant-one.pipeline.gate.project.review_example_com.'
108 'org_project.master.job.project-merge.SUCCESS', value='1|c')
109 self.assertReportedStat(
110 'zuul.tenant.tenant-one.pipeline.gate.resident_time', kind='ms')
111 self.assertReportedStat(
112 'zuul.tenant.tenant-one.pipeline.gate.total_changes', value='1|c')
113 self.assertReportedStat(
114 'zuul.tenant.tenant-one.pipeline.gate.project.review_example_com.'
115 'org_project.master.resident_time', kind='ms')
116 self.assertReportedStat(
117 'zuul.tenant.tenant-one.pipeline.gate.project.review_example_com.'
118 'org_project.master.total_changes', value='1|c')
James E. Blairfaf81982017-10-10 15:42:26 -0700119 exec_key = 'zuul.executor.%s' % self.executor_server.hostname
120 self.assertReportedStat(exec_key + '.builds', value='1|c')
James E. Blair4f1731b2017-10-10 18:11:42 -0700121 self.assertReportedStat('zuul.nodepool.requested', value='1|c')
122 self.assertReportedStat('zuul.nodepool.requested.label.label1',
123 value='1|c')
124 self.assertReportedStat('zuul.nodepool.fulfilled.label.label1',
125 value='1|c')
126 self.assertReportedStat('zuul.nodepool.requested.size.1', value='1|c')
127 self.assertReportedStat('zuul.nodepool.fulfilled.size.1', value='1|c')
128 self.assertReportedStat('zuul.nodepool.current_requests', value='1|g')
James E. Blairbdd50e62017-10-21 08:18:55 -0700129 self.assertReportedStat('zuul.executors.online', value='1|g')
130 self.assertReportedStat('zuul.executors.accepting', value='1|g')
131 self.assertReportedStat('zuul.mergers.online', value='1|g')
James E. Blair412e5582013-04-22 15:50:12 -0700132
James E. Blair2ef29e92017-07-21 15:25:05 -0700133 for build in self.history:
134 self.assertTrue(build.parameters['zuul']['voting'])
James E. Blair5821bd92015-09-16 08:48:15 -0700135
James E. Blair3cb10702013-08-24 08:56:03 -0700136 def test_initial_pipeline_gauges(self):
137 "Test that each pipeline reported its length on start"
James E. Blair57bf14d2017-10-21 09:09:48 -0700138 self.assertReportedStat('zuul.tenant.tenant-one.pipeline.gate.'
139 'current_changes',
James E. Blair7da51b72016-07-25 15:29:43 -0700140 value='0|g')
James E. Blair57bf14d2017-10-21 09:09:48 -0700141 self.assertReportedStat('zuul.tenant.tenant-one.pipeline.check.'
142 'current_changes',
James E. Blair7da51b72016-07-25 15:29:43 -0700143 value='0|g')
James E. Blair3cb10702013-08-24 08:56:03 -0700144
James E. Blair34776ee2016-08-25 13:53:54 -0700145 def test_job_branch(self):
146 "Test the correct variant of a job runs on a branch"
147 self.create_branch('org/project', 'stable')
148 A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200149 A.addApproval('Code-Review', 2)
150 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair34776ee2016-08-25 13:53:54 -0700151 self.waitUntilSettled()
152 self.assertEqual(self.getJobFromHistory('project-test1').result,
153 'SUCCESS')
154 self.assertEqual(self.getJobFromHistory('project-test2').result,
155 'SUCCESS')
156 self.assertEqual(A.data['status'], 'MERGED')
157 self.assertEqual(A.reported, 2,
158 "A should report start and success")
159 self.assertIn('gate', A.messages[1],
160 "A should transit gate")
161 self.assertEqual(self.getJobFromHistory('project-test1').node,
James E. Blair16d96a02017-06-08 11:32:56 -0700162 'label2')
James E. Blair34776ee2016-08-25 13:53:54 -0700163
James E. Blairb0fcae42012-07-17 11:12:10 -0700164 def test_parallel_changes(self):
165 "Test that changes are tested in parallel and merged in series"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700166
Paul Belanger174a8272017-03-14 13:20:10 -0400167 self.executor_server.hold_jobs_in_build = True
James E. Blairb0fcae42012-07-17 11:12:10 -0700168 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
169 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
170 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200171 A.addApproval('Code-Review', 2)
172 B.addApproval('Code-Review', 2)
173 C.addApproval('Code-Review', 2)
James E. Blairb0fcae42012-07-17 11:12:10 -0700174
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200175 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
176 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
177 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blairb0fcae42012-07-17 11:12:10 -0700178
179 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400180 self.assertEqual(len(self.builds), 1)
181 self.assertEqual(self.builds[0].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700182 self.assertTrue(self.builds[0].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700183
Paul Belanger174a8272017-03-14 13:20:10 -0400184 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700185 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400186 self.assertEqual(len(self.builds), 3)
187 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700188 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400189 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700190 self.assertTrue(self.builds[1].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400191 self.assertEqual(self.builds[2].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700192 self.assertTrue(self.builds[2].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700193
Paul Belanger174a8272017-03-14 13:20:10 -0400194 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700195 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400196 self.assertEqual(len(self.builds), 5)
197 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700198 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400199 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700200 self.assertTrue(self.builds[1].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700201
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400202 self.assertEqual(self.builds[2].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700203 self.assertTrue(self.builds[2].hasChanges(A, B))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400204 self.assertEqual(self.builds[3].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700205 self.assertTrue(self.builds[3].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700206
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400207 self.assertEqual(self.builds[4].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700208 self.assertTrue(self.builds[4].hasChanges(A, B, C))
James E. Blairb0fcae42012-07-17 11:12:10 -0700209
Paul Belanger174a8272017-03-14 13:20:10 -0400210 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700211 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400212 self.assertEqual(len(self.builds), 6)
213 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700214 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400215 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700216 self.assertTrue(self.builds[1].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700217
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400218 self.assertEqual(self.builds[2].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700219 self.assertTrue(self.builds[2].hasChanges(A, B))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400220 self.assertEqual(self.builds[3].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700221 self.assertTrue(self.builds[3].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700222
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400223 self.assertEqual(self.builds[4].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700224 self.assertTrue(self.builds[4].hasChanges(A, B, C))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400225 self.assertEqual(self.builds[5].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700226 self.assertTrue(self.builds[5].hasChanges(A, B, C))
James E. Blairb0fcae42012-07-17 11:12:10 -0700227
Paul Belanger174a8272017-03-14 13:20:10 -0400228 self.executor_server.hold_jobs_in_build = False
229 self.executor_server.release()
James E. Blairb0fcae42012-07-17 11:12:10 -0700230 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400231 self.assertEqual(len(self.builds), 0)
James E. Blairb0fcae42012-07-17 11:12:10 -0700232
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400233 self.assertEqual(len(self.history), 9)
234 self.assertEqual(A.data['status'], 'MERGED')
235 self.assertEqual(B.data['status'], 'MERGED')
236 self.assertEqual(C.data['status'], 'MERGED')
237 self.assertEqual(A.reported, 2)
238 self.assertEqual(B.reported, 2)
239 self.assertEqual(C.reported, 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700240
241 def test_failed_changes(self):
242 "Test that a change behind a failed change is retested"
Paul Belanger174a8272017-03-14 13:20:10 -0400243 self.executor_server.hold_jobs_in_build = True
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700244
James E. Blairb02a3bb2012-07-30 17:49:55 -0700245 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
246 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200247 A.addApproval('Code-Review', 2)
248 B.addApproval('Code-Review', 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700249
Paul Belanger174a8272017-03-14 13:20:10 -0400250 self.executor_server.failJob('project-test1', A)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700251
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200252 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
253 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blairb02a3bb2012-07-30 17:49:55 -0700254 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700255 self.assertBuilds([dict(name='project-merge', changes='1,1')])
James E. Blaire2819012013-06-28 17:17:26 -0400256
Paul Belanger174a8272017-03-14 13:20:10 -0400257 self.executor_server.release('.*-merge')
James E. Blaire2819012013-06-28 17:17:26 -0400258 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700259 # A/project-merge is complete
260 self.assertBuilds([
261 dict(name='project-test1', changes='1,1'),
262 dict(name='project-test2', changes='1,1'),
263 dict(name='project-merge', changes='1,1 2,1'),
264 ])
James E. Blaire2819012013-06-28 17:17:26 -0400265
Paul Belanger174a8272017-03-14 13:20:10 -0400266 self.executor_server.release('.*-merge')
James E. Blaire2819012013-06-28 17:17:26 -0400267 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700268 # A/project-merge is complete
269 # B/project-merge is complete
270 self.assertBuilds([
271 dict(name='project-test1', changes='1,1'),
272 dict(name='project-test2', changes='1,1'),
273 dict(name='project-test1', changes='1,1 2,1'),
274 dict(name='project-test2', changes='1,1 2,1'),
275 ])
276
277 # Release project-test1 for A which will fail. This will
Paul Belanger174a8272017-03-14 13:20:10 -0400278 # abort both running B jobs and reexecute project-merge for B.
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700279 self.builds[0].release()
280 self.waitUntilSettled()
281
282 self.orderedRelease()
283 self.assertHistory([
284 dict(name='project-merge', result='SUCCESS', changes='1,1'),
285 dict(name='project-merge', result='SUCCESS', changes='1,1 2,1'),
286 dict(name='project-test1', result='FAILURE', changes='1,1'),
287 dict(name='project-test1', result='ABORTED', changes='1,1 2,1'),
288 dict(name='project-test2', result='ABORTED', changes='1,1 2,1'),
289 dict(name='project-test2', result='SUCCESS', changes='1,1'),
290 dict(name='project-merge', result='SUCCESS', changes='2,1'),
291 dict(name='project-test1', result='SUCCESS', changes='2,1'),
292 dict(name='project-test2', result='SUCCESS', changes='2,1'),
James E. Blairb536ecc2016-08-31 10:11:42 -0700293 ], ordered=False)
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700294
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400295 self.assertEqual(A.data['status'], 'NEW')
296 self.assertEqual(B.data['status'], 'MERGED')
297 self.assertEqual(A.reported, 2)
298 self.assertEqual(B.reported, 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700299
300 def test_independent_queues(self):
301 "Test that changes end up in the right queues"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700302
Paul Belanger174a8272017-03-14 13:20:10 -0400303 self.executor_server.hold_jobs_in_build = True
Zhongyue Luo5d556072012-09-21 02:00:47 +0900304 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blairb02a3bb2012-07-30 17:49:55 -0700305 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
306 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200307 A.addApproval('Code-Review', 2)
308 B.addApproval('Code-Review', 2)
309 C.addApproval('Code-Review', 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700310
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200311 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blairf59f3cf2017-02-19 14:50:26 -0800312 self.waitUntilSettled()
James E. Blairb02a3bb2012-07-30 17:49:55 -0700313
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200314 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blairf59f3cf2017-02-19 14:50:26 -0800315 self.waitUntilSettled()
316
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200317 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blairb02a3bb2012-07-30 17:49:55 -0700318 self.waitUntilSettled()
319
320 # There should be one merge job at the head of each queue running
James E. Blair5f0d49e2016-08-19 09:36:50 -0700321 self.assertBuilds([
322 dict(name='project-merge', changes='1,1'),
323 dict(name='project-merge', changes='2,1'),
324 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700325
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700326 # Release the current merge builds
James E. Blair5f0d49e2016-08-19 09:36:50 -0700327 self.builds[0].release()
328 self.waitUntilSettled()
329 self.builds[0].release()
James E. Blairb02a3bb2012-07-30 17:49:55 -0700330 self.waitUntilSettled()
331 # Release the merge job for project2 which is behind project1
Paul Belanger174a8272017-03-14 13:20:10 -0400332 self.executor_server.release('.*-merge')
James E. Blairb02a3bb2012-07-30 17:49:55 -0700333 self.waitUntilSettled()
334
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700335 # All the test builds should be running:
James E. Blair5f0d49e2016-08-19 09:36:50 -0700336 self.assertBuilds([
337 dict(name='project-test1', changes='1,1'),
338 dict(name='project-test2', changes='1,1'),
339 dict(name='project-test1', changes='2,1'),
340 dict(name='project-test2', changes='2,1'),
Paul Belanger58bf6912016-11-11 19:36:01 -0500341 dict(name='project1-project2-integration', changes='2,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700342 dict(name='project-test1', changes='2,1 3,1'),
343 dict(name='project-test2', changes='2,1 3,1'),
Clint Byrumcd9393f2016-12-21 12:21:07 -0800344 dict(name='project1-project2-integration', changes='2,1 3,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700345 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700346
James E. Blair5f0d49e2016-08-19 09:36:50 -0700347 self.orderedRelease()
348 self.assertHistory([
349 dict(name='project-merge', result='SUCCESS', changes='1,1'),
350 dict(name='project-merge', result='SUCCESS', changes='2,1'),
351 dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'),
352 dict(name='project-test1', result='SUCCESS', changes='1,1'),
353 dict(name='project-test2', result='SUCCESS', changes='1,1'),
354 dict(name='project-test1', result='SUCCESS', changes='2,1'),
355 dict(name='project-test2', result='SUCCESS', changes='2,1'),
Paul Belanger58bf6912016-11-11 19:36:01 -0500356 dict(
357 name='project1-project2-integration',
358 result='SUCCESS',
359 changes='2,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700360 dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'),
361 dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'),
Clint Byrumcd9393f2016-12-21 12:21:07 -0800362 dict(name='project1-project2-integration',
363 result='SUCCESS',
364 changes='2,1 3,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700365 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700366
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400367 self.assertEqual(A.data['status'], 'MERGED')
368 self.assertEqual(B.data['status'], 'MERGED')
369 self.assertEqual(C.data['status'], 'MERGED')
370 self.assertEqual(A.reported, 2)
371 self.assertEqual(B.reported, 2)
372 self.assertEqual(C.reported, 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700373
374 def test_failed_change_at_head(self):
375 "Test that if a change at the head fails, jobs behind it are canceled"
James E. Blaird466dc42012-07-31 10:42:56 -0700376
Paul Belanger174a8272017-03-14 13:20:10 -0400377 self.executor_server.hold_jobs_in_build = True
James E. Blaird466dc42012-07-31 10:42:56 -0700378 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
379 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
380 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200381 A.addApproval('Code-Review', 2)
382 B.addApproval('Code-Review', 2)
383 C.addApproval('Code-Review', 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700384
Paul Belanger174a8272017-03-14 13:20:10 -0400385 self.executor_server.failJob('project-test1', A)
James E. Blaird466dc42012-07-31 10:42:56 -0700386
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200387 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
388 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
389 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blaird466dc42012-07-31 10:42:56 -0700390
391 self.waitUntilSettled()
James E. Blaird466dc42012-07-31 10:42:56 -0700392
James E. Blairb536ecc2016-08-31 10:11:42 -0700393 self.assertBuilds([
394 dict(name='project-merge', changes='1,1'),
395 ])
James E. Blaird466dc42012-07-31 10:42:56 -0700396
Paul Belanger174a8272017-03-14 13:20:10 -0400397 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700398 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400399 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700400 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400401 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700402 self.waitUntilSettled()
403
James E. Blairb536ecc2016-08-31 10:11:42 -0700404 self.assertBuilds([
405 dict(name='project-test1', changes='1,1'),
406 dict(name='project-test2', changes='1,1'),
407 dict(name='project-test1', changes='1,1 2,1'),
408 dict(name='project-test2', changes='1,1 2,1'),
409 dict(name='project-test1', changes='1,1 2,1 3,1'),
410 dict(name='project-test2', changes='1,1 2,1 3,1'),
411 ])
James E. Blaird466dc42012-07-31 10:42:56 -0700412
Monty Taylor6bef8ef2013-06-02 08:17:12 -0400413 self.release(self.builds[0])
James E. Blaird466dc42012-07-31 10:42:56 -0700414 self.waitUntilSettled()
415
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400416 # project-test2, project-merge for B
James E. Blairb536ecc2016-08-31 10:11:42 -0700417 self.assertBuilds([
418 dict(name='project-test2', changes='1,1'),
419 dict(name='project-merge', changes='2,1'),
420 ])
421 # Unordered history comparison because the aborts can finish
422 # in any order.
423 self.assertHistory([
424 dict(name='project-merge', result='SUCCESS',
425 changes='1,1'),
426 dict(name='project-merge', result='SUCCESS',
427 changes='1,1 2,1'),
428 dict(name='project-merge', result='SUCCESS',
429 changes='1,1 2,1 3,1'),
430 dict(name='project-test1', result='FAILURE',
431 changes='1,1'),
432 dict(name='project-test1', result='ABORTED',
433 changes='1,1 2,1'),
434 dict(name='project-test2', result='ABORTED',
435 changes='1,1 2,1'),
436 dict(name='project-test1', result='ABORTED',
437 changes='1,1 2,1 3,1'),
438 dict(name='project-test2', result='ABORTED',
439 changes='1,1 2,1 3,1'),
440 ], ordered=False)
James E. Blaird466dc42012-07-31 10:42:56 -0700441
Paul Belanger174a8272017-03-14 13:20:10 -0400442 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700443 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400444 self.executor_server.release('.*-merge')
James E. Blairb536ecc2016-08-31 10:11:42 -0700445 self.waitUntilSettled()
446 self.orderedRelease()
James E. Blaird466dc42012-07-31 10:42:56 -0700447
James E. Blairb536ecc2016-08-31 10:11:42 -0700448 self.assertBuilds([])
449 self.assertHistory([
450 dict(name='project-merge', result='SUCCESS',
451 changes='1,1'),
452 dict(name='project-merge', result='SUCCESS',
453 changes='1,1 2,1'),
454 dict(name='project-merge', result='SUCCESS',
455 changes='1,1 2,1 3,1'),
456 dict(name='project-test1', result='FAILURE',
457 changes='1,1'),
458 dict(name='project-test1', result='ABORTED',
459 changes='1,1 2,1'),
460 dict(name='project-test2', result='ABORTED',
461 changes='1,1 2,1'),
462 dict(name='project-test1', result='ABORTED',
463 changes='1,1 2,1 3,1'),
464 dict(name='project-test2', result='ABORTED',
465 changes='1,1 2,1 3,1'),
466 dict(name='project-merge', result='SUCCESS',
467 changes='2,1'),
468 dict(name='project-merge', result='SUCCESS',
469 changes='2,1 3,1'),
470 dict(name='project-test2', result='SUCCESS',
471 changes='1,1'),
472 dict(name='project-test1', result='SUCCESS',
473 changes='2,1'),
474 dict(name='project-test2', result='SUCCESS',
475 changes='2,1'),
476 dict(name='project-test1', result='SUCCESS',
477 changes='2,1 3,1'),
478 dict(name='project-test2', result='SUCCESS',
479 changes='2,1 3,1'),
480 ], ordered=False)
481
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400482 self.assertEqual(A.data['status'], 'NEW')
483 self.assertEqual(B.data['status'], 'MERGED')
484 self.assertEqual(C.data['status'], 'MERGED')
485 self.assertEqual(A.reported, 2)
486 self.assertEqual(B.reported, 2)
487 self.assertEqual(C.reported, 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700488
James E. Blair0aac4872013-08-23 14:02:38 -0700489 def test_failed_change_in_middle(self):
490 "Test a failed change in the middle of the queue"
491
Paul Belanger174a8272017-03-14 13:20:10 -0400492 self.executor_server.hold_jobs_in_build = True
James E. Blair0aac4872013-08-23 14:02:38 -0700493 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
494 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
495 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200496 A.addApproval('Code-Review', 2)
497 B.addApproval('Code-Review', 2)
498 C.addApproval('Code-Review', 2)
James E. Blair0aac4872013-08-23 14:02:38 -0700499
Paul Belanger174a8272017-03-14 13:20:10 -0400500 self.executor_server.failJob('project-test1', B)
James E. Blair0aac4872013-08-23 14:02:38 -0700501
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200502 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
503 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
504 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair0aac4872013-08-23 14:02:38 -0700505
506 self.waitUntilSettled()
507
Paul Belanger174a8272017-03-14 13:20:10 -0400508 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700509 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400510 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700511 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400512 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700513 self.waitUntilSettled()
514
515 self.assertEqual(len(self.builds), 6)
516 self.assertEqual(self.builds[0].name, 'project-test1')
517 self.assertEqual(self.builds[1].name, 'project-test2')
518 self.assertEqual(self.builds[2].name, 'project-test1')
519 self.assertEqual(self.builds[3].name, 'project-test2')
520 self.assertEqual(self.builds[4].name, 'project-test1')
521 self.assertEqual(self.builds[5].name, 'project-test2')
522
523 self.release(self.builds[2])
524 self.waitUntilSettled()
525
James E. Blair972e3c72013-08-29 12:04:55 -0700526 # project-test1 and project-test2 for A
527 # project-test2 for B
528 # project-merge for C (without B)
529 self.assertEqual(len(self.builds), 4)
James E. Blair0aac4872013-08-23 14:02:38 -0700530 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 2)
531
Paul Belanger174a8272017-03-14 13:20:10 -0400532 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -0700533 self.waitUntilSettled()
534
535 # project-test1 and project-test2 for A
536 # project-test2 for B
537 # project-test1 and project-test2 for C
538 self.assertEqual(len(self.builds), 5)
539
Paul Belanger2e2a0492016-10-30 18:33:37 -0400540 tenant = self.sched.abide.tenants.get('tenant-one')
541 items = tenant.layout.pipelines['gate'].getAllItems()
James E. Blair0aac4872013-08-23 14:02:38 -0700542 builds = items[0].current_build_set.getBuilds()
543 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
544 self.assertEqual(self.countJobResults(builds, None), 2)
545 builds = items[1].current_build_set.getBuilds()
546 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
547 self.assertEqual(self.countJobResults(builds, 'FAILURE'), 1)
548 self.assertEqual(self.countJobResults(builds, None), 1)
549 builds = items[2].current_build_set.getBuilds()
550 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
James E. Blair972e3c72013-08-29 12:04:55 -0700551 self.assertEqual(self.countJobResults(builds, None), 2)
James E. Blair0aac4872013-08-23 14:02:38 -0700552
Paul Belanger174a8272017-03-14 13:20:10 -0400553 self.executor_server.hold_jobs_in_build = False
554 self.executor_server.release()
James E. Blair0aac4872013-08-23 14:02:38 -0700555 self.waitUntilSettled()
556
557 self.assertEqual(len(self.builds), 0)
558 self.assertEqual(len(self.history), 12)
559 self.assertEqual(A.data['status'], 'MERGED')
560 self.assertEqual(B.data['status'], 'NEW')
561 self.assertEqual(C.data['status'], 'MERGED')
562 self.assertEqual(A.reported, 2)
563 self.assertEqual(B.reported, 2)
564 self.assertEqual(C.reported, 2)
565
James E. Blaird466dc42012-07-31 10:42:56 -0700566 def test_failed_change_at_head_with_queue(self):
567 "Test that if a change at the head fails, queued jobs are canceled"
James E. Blaird466dc42012-07-31 10:42:56 -0700568
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700569 self.gearman_server.hold_jobs_in_queue = True
James E. Blaird466dc42012-07-31 10:42:56 -0700570 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
571 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
572 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200573 A.addApproval('Code-Review', 2)
574 B.addApproval('Code-Review', 2)
575 C.addApproval('Code-Review', 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700576
Paul Belanger174a8272017-03-14 13:20:10 -0400577 self.executor_server.failJob('project-test1', A)
James E. Blaird466dc42012-07-31 10:42:56 -0700578
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200579 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
580 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
581 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blaird466dc42012-07-31 10:42:56 -0700582
583 self.waitUntilSettled()
James E. Blair701c5b42013-06-06 09:34:59 -0700584 queue = self.gearman_server.getQueue()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400585 self.assertEqual(len(self.builds), 0)
586 self.assertEqual(len(queue), 1)
Clint Byrumf322fe22017-05-10 20:53:12 -0700587 self.assertEqual(queue[0].name, b'executor:execute')
588 job_args = json.loads(queue[0].arguments.decode('utf8'))
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800589 self.assertEqual(job_args['job'], 'project-merge')
590 self.assertEqual(job_args['items'][0]['number'], '%d' % A.number)
James E. Blaird466dc42012-07-31 10:42:56 -0700591
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700592 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700593 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700594 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700595 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700596 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700597 self.waitUntilSettled()
James E. Blair701c5b42013-06-06 09:34:59 -0700598 queue = self.gearman_server.getQueue()
James E. Blaird466dc42012-07-31 10:42:56 -0700599
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400600 self.assertEqual(len(self.builds), 0)
601 self.assertEqual(len(queue), 6)
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800602
603 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700604 json.loads(queue[0].arguments.decode('utf8'))['job'],
605 'project-test1')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800606 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700607 json.loads(queue[1].arguments.decode('utf8'))['job'],
608 'project-test2')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800609 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700610 json.loads(queue[2].arguments.decode('utf8'))['job'],
611 'project-test1')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800612 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700613 json.loads(queue[3].arguments.decode('utf8'))['job'],
614 'project-test2')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800615 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700616 json.loads(queue[4].arguments.decode('utf8'))['job'],
617 'project-test1')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800618 self.assertEqual(
Clint Byrumf322fe22017-05-10 20:53:12 -0700619 json.loads(queue[5].arguments.decode('utf8'))['job'],
620 'project-test2')
James E. Blaird466dc42012-07-31 10:42:56 -0700621
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700622 self.release(queue[0])
James E. Blaird466dc42012-07-31 10:42:56 -0700623 self.waitUntilSettled()
624
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400625 self.assertEqual(len(self.builds), 0)
James E. Blair701c5b42013-06-06 09:34:59 -0700626 queue = self.gearman_server.getQueue()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400627 self.assertEqual(len(queue), 2) # project-test2, project-merge for B
628 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 0)
James E. Blaird466dc42012-07-31 10:42:56 -0700629
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700630 self.gearman_server.hold_jobs_in_queue = False
631 self.gearman_server.release()
James E. Blaird466dc42012-07-31 10:42:56 -0700632 self.waitUntilSettled()
633
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400634 self.assertEqual(len(self.builds), 0)
635 self.assertEqual(len(self.history), 11)
636 self.assertEqual(A.data['status'], 'NEW')
637 self.assertEqual(B.data['status'], 'MERGED')
638 self.assertEqual(C.data['status'], 'MERGED')
639 self.assertEqual(A.reported, 2)
640 self.assertEqual(B.reported, 2)
641 self.assertEqual(C.reported, 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700642
James E. Blairce8a2132016-05-19 15:21:52 -0700643 def _test_time_database(self, iteration):
Paul Belanger174a8272017-03-14 13:20:10 -0400644 self.executor_server.hold_jobs_in_build = True
James E. Blairce8a2132016-05-19 15:21:52 -0700645 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200646 A.addApproval('Code-Review', 2)
647 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blairce8a2132016-05-19 15:21:52 -0700648 self.waitUntilSettled()
649 time.sleep(2)
650
James E. Blairae0f23c2017-09-13 10:55:15 -0600651 data = json.loads(self.sched.formatStatusJSON('tenant-one'))
James E. Blairce8a2132016-05-19 15:21:52 -0700652 found_job = None
653 for pipeline in data['pipelines']:
654 if pipeline['name'] != 'gate':
655 continue
656 for queue in pipeline['change_queues']:
657 for head in queue['heads']:
658 for item in head:
659 for job in item['jobs']:
660 if job['name'] == 'project-merge':
661 found_job = job
662 break
663
664 self.assertIsNotNone(found_job)
665 if iteration == 1:
666 self.assertIsNotNone(found_job['estimated_time'])
667 self.assertIsNone(found_job['remaining_time'])
668 else:
669 self.assertIsNotNone(found_job['estimated_time'])
670 self.assertTrue(found_job['estimated_time'] >= 2)
671 self.assertIsNotNone(found_job['remaining_time'])
672
Paul Belanger174a8272017-03-14 13:20:10 -0400673 self.executor_server.hold_jobs_in_build = False
674 self.executor_server.release()
James E. Blairce8a2132016-05-19 15:21:52 -0700675 self.waitUntilSettled()
676
677 def test_time_database(self):
678 "Test the time database"
679
680 self._test_time_database(1)
681 self._test_time_database(2)
682
James E. Blairfef71632013-09-23 11:15:47 -0700683 def test_two_failed_changes_at_head(self):
684 "Test that changes are reparented correctly if 2 fail at head"
685
Paul Belanger174a8272017-03-14 13:20:10 -0400686 self.executor_server.hold_jobs_in_build = True
James E. Blairfef71632013-09-23 11:15:47 -0700687 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
688 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
689 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200690 A.addApproval('Code-Review', 2)
691 B.addApproval('Code-Review', 2)
692 C.addApproval('Code-Review', 2)
James E. Blairfef71632013-09-23 11:15:47 -0700693
Paul Belanger174a8272017-03-14 13:20:10 -0400694 self.executor_server.failJob('project-test1', A)
695 self.executor_server.failJob('project-test1', B)
James E. Blairfef71632013-09-23 11:15:47 -0700696
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200697 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
698 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
699 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blairfef71632013-09-23 11:15:47 -0700700 self.waitUntilSettled()
701
Paul Belanger174a8272017-03-14 13:20:10 -0400702 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700703 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400704 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700705 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400706 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700707 self.waitUntilSettled()
708
709 self.assertEqual(len(self.builds), 6)
710 self.assertEqual(self.builds[0].name, 'project-test1')
711 self.assertEqual(self.builds[1].name, 'project-test2')
712 self.assertEqual(self.builds[2].name, 'project-test1')
713 self.assertEqual(self.builds[3].name, 'project-test2')
714 self.assertEqual(self.builds[4].name, 'project-test1')
715 self.assertEqual(self.builds[5].name, 'project-test2')
716
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400717 self.assertTrue(self.builds[0].hasChanges(A))
718 self.assertTrue(self.builds[2].hasChanges(A))
719 self.assertTrue(self.builds[2].hasChanges(B))
720 self.assertTrue(self.builds[4].hasChanges(A))
721 self.assertTrue(self.builds[4].hasChanges(B))
722 self.assertTrue(self.builds[4].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700723
724 # Fail change B first
725 self.release(self.builds[2])
726 self.waitUntilSettled()
727
728 # restart of C after B failure
Paul Belanger174a8272017-03-14 13:20:10 -0400729 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700730 self.waitUntilSettled()
731
732 self.assertEqual(len(self.builds), 5)
733 self.assertEqual(self.builds[0].name, 'project-test1')
734 self.assertEqual(self.builds[1].name, 'project-test2')
735 self.assertEqual(self.builds[2].name, 'project-test2')
736 self.assertEqual(self.builds[3].name, 'project-test1')
737 self.assertEqual(self.builds[4].name, 'project-test2')
738
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400739 self.assertTrue(self.builds[1].hasChanges(A))
740 self.assertTrue(self.builds[2].hasChanges(A))
741 self.assertTrue(self.builds[2].hasChanges(B))
742 self.assertTrue(self.builds[4].hasChanges(A))
743 self.assertFalse(self.builds[4].hasChanges(B))
744 self.assertTrue(self.builds[4].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700745
746 # Finish running all passing jobs for change A
747 self.release(self.builds[1])
748 self.waitUntilSettled()
749 # Fail and report change A
750 self.release(self.builds[0])
751 self.waitUntilSettled()
752
753 # restart of B,C after A failure
Paul Belanger174a8272017-03-14 13:20:10 -0400754 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700755 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400756 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700757 self.waitUntilSettled()
758
759 self.assertEqual(len(self.builds), 4)
760 self.assertEqual(self.builds[0].name, 'project-test1') # B
761 self.assertEqual(self.builds[1].name, 'project-test2') # B
762 self.assertEqual(self.builds[2].name, 'project-test1') # C
763 self.assertEqual(self.builds[3].name, 'project-test2') # C
764
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400765 self.assertFalse(self.builds[1].hasChanges(A))
766 self.assertTrue(self.builds[1].hasChanges(B))
767 self.assertFalse(self.builds[1].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700768
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400769 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blairfef71632013-09-23 11:15:47 -0700770 # After A failed and B and C restarted, B should be back in
771 # C's tests because it has not failed yet.
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400772 self.assertTrue(self.builds[2].hasChanges(B))
773 self.assertTrue(self.builds[2].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700774
Paul Belanger174a8272017-03-14 13:20:10 -0400775 self.executor_server.hold_jobs_in_build = False
776 self.executor_server.release()
James E. Blairfef71632013-09-23 11:15:47 -0700777 self.waitUntilSettled()
778
779 self.assertEqual(len(self.builds), 0)
780 self.assertEqual(len(self.history), 21)
781 self.assertEqual(A.data['status'], 'NEW')
782 self.assertEqual(B.data['status'], 'NEW')
783 self.assertEqual(C.data['status'], 'MERGED')
784 self.assertEqual(A.reported, 2)
785 self.assertEqual(B.reported, 2)
786 self.assertEqual(C.reported, 2)
787
James E. Blair8c803f82012-07-31 16:25:42 -0700788 def test_patch_order(self):
789 "Test that dependent patches are tested in the right order"
790 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
791 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
792 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200793 A.addApproval('Code-Review', 2)
794 B.addApproval('Code-Review', 2)
795 C.addApproval('Code-Review', 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700796
797 M2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M2')
798 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
799 M2.setMerged()
800 M1.setMerged()
801
802 # C -> B -> A -> M1 -> M2
803 # M2 is here to make sure it is never queried. If it is, it
804 # means zuul is walking down the entire history of merged
805 # changes.
806
807 C.setDependsOn(B, 1)
808 B.setDependsOn(A, 1)
809 A.setDependsOn(M1, 1)
810 M1.setDependsOn(M2, 1)
811
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200812 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair8c803f82012-07-31 16:25:42 -0700813
814 self.waitUntilSettled()
815
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400816 self.assertEqual(A.data['status'], 'NEW')
817 self.assertEqual(B.data['status'], 'NEW')
818 self.assertEqual(C.data['status'], 'NEW')
James E. Blair8c803f82012-07-31 16:25:42 -0700819
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200820 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
821 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair8c803f82012-07-31 16:25:42 -0700822
823 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400824 self.assertEqual(M2.queried, 0)
825 self.assertEqual(A.data['status'], 'MERGED')
826 self.assertEqual(B.data['status'], 'MERGED')
827 self.assertEqual(C.data['status'], 'MERGED')
828 self.assertEqual(A.reported, 2)
829 self.assertEqual(B.reported, 2)
830 self.assertEqual(C.reported, 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700831
James E. Blair063672f2015-01-29 13:09:12 -0800832 def test_needed_changes_enqueue(self):
833 "Test that a needed change is enqueued ahead"
834 # A Given a git tree like this, if we enqueue
835 # / \ change C, we should walk up and down the tree
836 # B G and enqueue changes in the order ABCDEFG.
837 # /|\ This is also the order that you would get if
838 # *C E F you enqueued changes in the order ABCDEFG, so
839 # / the ordering is stable across re-enqueue events.
840 # D
841
842 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
843 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
844 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
845 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
846 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
847 F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F')
848 G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G')
849 B.setDependsOn(A, 1)
850 C.setDependsOn(B, 1)
851 D.setDependsOn(C, 1)
852 E.setDependsOn(B, 1)
853 F.setDependsOn(B, 1)
854 G.setDependsOn(A, 1)
855
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200856 A.addApproval('Code-Review', 2)
857 B.addApproval('Code-Review', 2)
858 C.addApproval('Code-Review', 2)
859 D.addApproval('Code-Review', 2)
860 E.addApproval('Code-Review', 2)
861 F.addApproval('Code-Review', 2)
862 G.addApproval('Code-Review', 2)
863 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair063672f2015-01-29 13:09:12 -0800864
865 self.waitUntilSettled()
866
867 self.assertEqual(A.data['status'], 'NEW')
868 self.assertEqual(B.data['status'], 'NEW')
869 self.assertEqual(C.data['status'], 'NEW')
870 self.assertEqual(D.data['status'], 'NEW')
871 self.assertEqual(E.data['status'], 'NEW')
872 self.assertEqual(F.data['status'], 'NEW')
873 self.assertEqual(G.data['status'], 'NEW')
874
875 # We're about to add approvals to changes without adding the
876 # triggering events to Zuul, so that we can be sure that it is
877 # enqueing the changes based on dependencies, not because of
878 # triggering events. Since it will have the changes cached
879 # already (without approvals), we need to clear the cache
880 # first.
Paul Belanger593480a2016-11-02 19:06:28 -0400881 for connection in self.connections.connections.values():
James E. Blairb0a95ab2017-10-18 09:39:18 -0700882 connection.maintainCache([])
James E. Blair063672f2015-01-29 13:09:12 -0800883
Paul Belanger174a8272017-03-14 13:20:10 -0400884 self.executor_server.hold_jobs_in_build = True
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200885 A.addApproval('Approved', 1)
886 B.addApproval('Approved', 1)
887 D.addApproval('Approved', 1)
888 E.addApproval('Approved', 1)
889 F.addApproval('Approved', 1)
890 G.addApproval('Approved', 1)
891 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair063672f2015-01-29 13:09:12 -0800892
893 for x in range(8):
Paul Belanger174a8272017-03-14 13:20:10 -0400894 self.executor_server.release('.*-merge')
James E. Blair063672f2015-01-29 13:09:12 -0800895 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400896 self.executor_server.hold_jobs_in_build = False
897 self.executor_server.release()
James E. Blair063672f2015-01-29 13:09:12 -0800898 self.waitUntilSettled()
899
900 self.assertEqual(A.data['status'], 'MERGED')
901 self.assertEqual(B.data['status'], 'MERGED')
902 self.assertEqual(C.data['status'], 'MERGED')
903 self.assertEqual(D.data['status'], 'MERGED')
904 self.assertEqual(E.data['status'], 'MERGED')
905 self.assertEqual(F.data['status'], 'MERGED')
906 self.assertEqual(G.data['status'], 'MERGED')
907 self.assertEqual(A.reported, 2)
908 self.assertEqual(B.reported, 2)
909 self.assertEqual(C.reported, 2)
910 self.assertEqual(D.reported, 2)
911 self.assertEqual(E.reported, 2)
912 self.assertEqual(F.reported, 2)
913 self.assertEqual(G.reported, 2)
914 self.assertEqual(self.history[6].changes,
915 '1,1 2,1 3,1 4,1 5,1 6,1 7,1')
916
Joshua Hesketh850ccb62014-11-27 11:31:02 +1100917 def test_source_cache(self):
918 "Test that the source cache operates correctly"
Paul Belanger174a8272017-03-14 13:20:10 -0400919 self.executor_server.hold_jobs_in_build = True
James E. Blair0e933c52013-07-11 10:18:52 -0700920
921 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
922 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
923 X = self.fake_gerrit.addFakeChange('org/project', 'master', 'X')
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200924 A.addApproval('Code-Review', 2)
925 B.addApproval('Code-Review', 2)
James E. Blair0e933c52013-07-11 10:18:52 -0700926
927 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
928 M1.setMerged()
929
930 B.setDependsOn(A, 1)
931 A.setDependsOn(M1, 1)
932
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200933 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair0e933c52013-07-11 10:18:52 -0700934 self.fake_gerrit.addEvent(X.getPatchsetCreatedEvent(1))
935
936 self.waitUntilSettled()
937
938 for build in self.builds:
James E. Blaire675d682017-07-21 15:29:35 -0700939 if build.pipeline == 'check':
James E. Blair0e933c52013-07-11 10:18:52 -0700940 build.release()
941 self.waitUntilSettled()
942 for build in self.builds:
James E. Blaire675d682017-07-21 15:29:35 -0700943 if build.pipeline == 'check':
James E. Blair0e933c52013-07-11 10:18:52 -0700944 build.release()
945 self.waitUntilSettled()
946
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200947 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair0e933c52013-07-11 10:18:52 -0700948 self.waitUntilSettled()
949
Joshua Hesketh352264b2015-08-11 23:42:08 +1000950 self.log.debug("len %s" % self.fake_gerrit._change_cache.keys())
James E. Blair0e933c52013-07-11 10:18:52 -0700951 # there should still be changes in the cache
James E. Blairb0a95ab2017-10-18 09:39:18 -0700952 self.assertNotEqual(len(self.fake_gerrit._change_cache.keys()), 0)
James E. Blair0e933c52013-07-11 10:18:52 -0700953
Paul Belanger174a8272017-03-14 13:20:10 -0400954 self.executor_server.hold_jobs_in_build = False
955 self.executor_server.release()
James E. Blair0e933c52013-07-11 10:18:52 -0700956 self.waitUntilSettled()
957
958 self.assertEqual(A.data['status'], 'MERGED')
959 self.assertEqual(B.data['status'], 'MERGED')
960 self.assertEqual(A.queried, 2) # Initial and isMerged
961 self.assertEqual(B.queried, 3) # Initial A, refresh from B, isMerged
962
James E. Blair8c803f82012-07-31 16:25:42 -0700963 def test_can_merge(self):
James E. Blair4886cc12012-07-18 15:39:41 -0700964 "Test whether a change is ready to merge"
James E. Blair8c803f82012-07-31 16:25:42 -0700965 # TODO: move to test_gerrit (this is a unit test!)
966 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belanger9bba4902016-11-02 16:07:33 -0400967 tenant = self.sched.abide.tenants.get('tenant-one')
James E. Blair6053de42017-04-05 11:27:11 -0700968 (trusted, project) = tenant.getProject('org/project')
969 source = project.source
Paul Belanger9bba4902016-11-02 16:07:33 -0400970
971 # TODO(pabelanger): As we add more source / trigger APIs we should make
972 # it easier for users to create events for testing.
973 event = zuul.model.TriggerEvent()
974 event.trigger_name = 'gerrit'
975 event.change_number = '1'
976 event.patch_number = '2'
977
978 a = source.getChange(event)
979 mgr = tenant.layout.pipelines['gate'].manager
James E. Blairc0dedf82014-08-06 09:37:52 -0700980 self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair8c803f82012-07-31 16:25:42 -0700981
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200982 A.addApproval('Code-Review', 2)
Paul Belanger9bba4902016-11-02 16:07:33 -0400983 a = source.getChange(event, refresh=True)
James E. Blairc0dedf82014-08-06 09:37:52 -0700984 self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair8c803f82012-07-31 16:25:42 -0700985
Tobias Henkelbf24fd12017-07-27 06:13:07 +0200986 A.addApproval('Approved', 1)
Paul Belanger9bba4902016-11-02 16:07:33 -0400987 a = source.getChange(event, refresh=True)
James E. Blairc0dedf82014-08-06 09:37:52 -0700988 self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair4886cc12012-07-18 15:39:41 -0700989
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -0700990 def test_project_merge_conflict(self):
991 "Test that gate merge conflicts are handled properly"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700992
993 self.gearman_server.hold_jobs_in_queue = True
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -0700994 A = self.fake_gerrit.addFakeChange('org/project',
995 'master', 'A',
996 files={'conflict': 'foo'})
997 B = self.fake_gerrit.addFakeChange('org/project',
998 'master', 'B',
999 files={'conflict': 'bar'})
1000 C = self.fake_gerrit.addFakeChange('org/project',
James E. Blair6736beb2013-07-11 15:18:15 -07001001 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001002 A.addApproval('Code-Review', 2)
1003 B.addApproval('Code-Review', 2)
1004 C.addApproval('Code-Review', 2)
1005 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
1006 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
1007 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair973721f2012-08-15 10:19:43 -07001008 self.waitUntilSettled()
1009
James E. Blair6736beb2013-07-11 15:18:15 -07001010 self.assertEqual(A.reported, 1)
James E. Blair6736beb2013-07-11 15:18:15 -07001011 self.assertEqual(C.reported, 1)
1012
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001013 self.gearman_server.release('project-merge')
James E. Blair973721f2012-08-15 10:19:43 -07001014 self.waitUntilSettled()
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001015 self.gearman_server.release('project-merge')
James E. Blair973721f2012-08-15 10:19:43 -07001016 self.waitUntilSettled()
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001017 self.gearman_server.release('project-merge')
James E. Blair973721f2012-08-15 10:19:43 -07001018 self.waitUntilSettled()
James E. Blair972e3c72013-08-29 12:04:55 -07001019
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001020 self.gearman_server.hold_jobs_in_queue = False
1021 self.gearman_server.release()
James E. Blair973721f2012-08-15 10:19:43 -07001022 self.waitUntilSettled()
1023
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001024 self.assertEqual(A.data['status'], 'MERGED')
1025 self.assertEqual(B.data['status'], 'NEW')
1026 self.assertEqual(C.data['status'], 'MERGED')
1027 self.assertEqual(A.reported, 2)
Tobias Henkel9842bd72017-05-16 13:40:03 +02001028 self.assertIn('Merge Failed', B.messages[-1])
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001029 self.assertEqual(C.reported, 2)
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001030
1031 self.assertHistory([
1032 dict(name='project-merge', result='SUCCESS', changes='1,1'),
1033 dict(name='project-test1', result='SUCCESS', changes='1,1'),
1034 dict(name='project-test2', result='SUCCESS', changes='1,1'),
1035 dict(name='project-merge', result='SUCCESS', changes='1,1 3,1'),
1036 dict(name='project-test1', result='SUCCESS', changes='1,1 3,1'),
1037 dict(name='project-test2', result='SUCCESS', changes='1,1 3,1'),
1038 ], ordered=False)
1039
1040 def test_delayed_merge_conflict(self):
1041 "Test that delayed check merge conflicts are handled properly"
1042
1043 # Hold jobs in the gearman queue so that we can test whether
James E. Blair1960d682017-04-28 15:44:14 -07001044 # the executor sucesfully merges a change based on an old
1045 # repo state (frozen by the scheduler) which would otherwise
1046 # conflict.
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001047 self.gearman_server.hold_jobs_in_queue = True
1048 A = self.fake_gerrit.addFakeChange('org/project',
1049 'master', 'A',
1050 files={'conflict': 'foo'})
1051 B = self.fake_gerrit.addFakeChange('org/project',
1052 'master', 'B',
1053 files={'conflict': 'bar'})
1054 C = self.fake_gerrit.addFakeChange('org/project',
1055 'master', 'C')
1056 C.setDependsOn(B, 1)
1057
1058 # A enters the gate queue; B and C enter the check queue
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001059 A.addApproval('Code-Review', 2)
1060 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001061 self.waitUntilSettled()
1062 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
James E. Blair8d144dc2017-05-05 10:13:45 -07001063 self.waitUntilSettled()
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001064 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
1065 self.waitUntilSettled()
1066
1067 self.assertEqual(A.reported, 1)
1068 self.assertEqual(B.reported, 0) # Check does not report start
1069 self.assertEqual(C.reported, 0) # Check does not report start
1070
1071 # A merges while B and C are queued in check
1072 # Release A project-merge
1073 queue = self.gearman_server.getQueue()
1074 self.release(queue[0])
1075 self.waitUntilSettled()
1076
1077 # Release A project-test*
1078 # gate has higher precedence, so A's test jobs are added in
1079 # front of the merge jobs for B and C
1080 queue = self.gearman_server.getQueue()
1081 self.release(queue[0])
1082 self.release(queue[1])
1083 self.waitUntilSettled()
1084
1085 self.assertEqual(A.data['status'], 'MERGED')
1086 self.assertEqual(B.data['status'], 'NEW')
1087 self.assertEqual(C.data['status'], 'NEW')
1088 self.assertEqual(A.reported, 2)
1089 self.assertEqual(B.reported, 0)
1090 self.assertEqual(C.reported, 0)
1091 self.assertHistory([
1092 dict(name='project-merge', result='SUCCESS', changes='1,1'),
1093 dict(name='project-test1', result='SUCCESS', changes='1,1'),
1094 dict(name='project-test2', result='SUCCESS', changes='1,1'),
1095 ], ordered=False)
1096
1097 # B and C report merge conflicts
1098 # Release B project-merge
1099 queue = self.gearman_server.getQueue()
1100 self.release(queue[0])
1101 self.waitUntilSettled()
1102
1103 # Release C
1104 self.gearman_server.hold_jobs_in_queue = False
1105 self.gearman_server.release()
1106 self.waitUntilSettled()
1107
1108 self.assertEqual(A.data['status'], 'MERGED')
1109 self.assertEqual(B.data['status'], 'NEW')
1110 self.assertEqual(C.data['status'], 'NEW')
1111 self.assertEqual(A.reported, 2)
1112 self.assertEqual(B.reported, 1)
1113 self.assertEqual(C.reported, 1)
1114
1115 self.assertHistory([
1116 dict(name='project-merge', result='SUCCESS', changes='1,1'),
1117 dict(name='project-test1', result='SUCCESS', changes='1,1'),
1118 dict(name='project-test2', result='SUCCESS', changes='1,1'),
James E. Blair1960d682017-04-28 15:44:14 -07001119 dict(name='project-merge', result='SUCCESS', changes='2,1'),
1120 dict(name='project-test1', result='SUCCESS', changes='2,1'),
1121 dict(name='project-test2', result='SUCCESS', changes='2,1'),
1122 dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'),
1123 dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'),
1124 dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'),
K Jonathan Harkerae04e4c2017-03-15 19:07:11 -07001125 ], ordered=False)
James E. Blair6736beb2013-07-11 15:18:15 -07001126
James E. Blairdaabed22012-08-15 15:38:57 -07001127 def test_post(self):
1128 "Test that post jobs run"
James E. Blair289f5932017-07-27 15:02:29 -07001129 p = "review.example.com/org/project"
1130 upstream = self.getUpstreamRepos([p])
1131 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1132 A.setMerged()
1133 A_commit = str(upstream[p].commit('master'))
1134 self.log.debug("A commit: %s" % A_commit)
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001135
Zhongyue Luo5d556072012-09-21 02:00:47 +09001136 e = {
1137 "type": "ref-updated",
1138 "submitter": {
1139 "name": "User Name",
1140 },
1141 "refUpdate": {
1142 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
James E. Blair289f5932017-07-27 15:02:29 -07001143 "newRev": A_commit,
Zhongyue Luo5d556072012-09-21 02:00:47 +09001144 "refName": "master",
1145 "project": "org/project",
1146 }
1147 }
James E. Blairdaabed22012-08-15 15:38:57 -07001148 self.fake_gerrit.addEvent(e)
1149 self.waitUntilSettled()
1150
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001151 job_names = [x.name for x in self.history]
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001152 self.assertEqual(len(self.history), 1)
1153 self.assertIn('project-post', job_names)
James E. Blairc6294a52012-08-17 10:19:48 -07001154
K Jonathan Harkerf95e7232015-04-29 13:33:16 -07001155 def test_post_ignore_deletes(self):
1156 "Test that deleting refs does not trigger post jobs"
1157
1158 e = {
1159 "type": "ref-updated",
1160 "submitter": {
1161 "name": "User Name",
1162 },
1163 "refUpdate": {
1164 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
1165 "newRev": "0000000000000000000000000000000000000000",
1166 "refName": "master",
1167 "project": "org/project",
1168 }
1169 }
1170 self.fake_gerrit.addEvent(e)
1171 self.waitUntilSettled()
1172
1173 job_names = [x.name for x in self.history]
1174 self.assertEqual(len(self.history), 0)
1175 self.assertNotIn('project-post', job_names)
1176
James E. Blaircc324192017-04-19 14:36:08 -07001177 @simple_layout('layouts/dont-ignore-ref-deletes.yaml')
K Jonathan Harkerf95e7232015-04-29 13:33:16 -07001178 def test_post_ignore_deletes_negative(self):
1179 "Test that deleting refs does trigger post jobs"
K Jonathan Harkerf95e7232015-04-29 13:33:16 -07001180 e = {
1181 "type": "ref-updated",
1182 "submitter": {
1183 "name": "User Name",
1184 },
1185 "refUpdate": {
1186 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
1187 "newRev": "0000000000000000000000000000000000000000",
James E. Blair289f5932017-07-27 15:02:29 -07001188 "refName": "testbranch",
K Jonathan Harkerf95e7232015-04-29 13:33:16 -07001189 "project": "org/project",
1190 }
1191 }
1192 self.fake_gerrit.addEvent(e)
1193 self.waitUntilSettled()
1194
1195 job_names = [x.name for x in self.history]
1196 self.assertEqual(len(self.history), 1)
1197 self.assertIn('project-post', job_names)
1198
James E. Blairec056492016-07-22 09:45:56 -07001199 @skip("Disabled for early v3 development")
James E. Blairc6294a52012-08-17 10:19:48 -07001200 def test_build_configuration_branch_interaction(self):
1201 "Test that switching between branches works"
1202 self.test_build_configuration()
1203 self.test_build_configuration_branch()
1204 # C has been merged, undo that
Monty Taylorbc758832013-06-17 17:22:42 -04001205 path = os.path.join(self.upstream_root, "org/project")
James E. Blairc6294a52012-08-17 10:19:48 -07001206 repo = git.Repo(path)
1207 repo.heads.master.commit = repo.commit('init')
1208 self.test_build_configuration()
1209
James E. Blairdb93b302017-07-19 15:33:11 -07001210 def test_dependent_changes_rebase(self):
1211 # Test that no errors occur when we walk a dependency tree
1212 # with an unused leaf node due to a rebase.
1213 # Start by constructing: C -> B -> A
1214 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1215 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1216 B.setDependsOn(A, 1)
1217
1218 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1219 C.setDependsOn(B, 1)
1220
1221 # Then rebase to form: D -> C -> A
1222 C.addPatchset() # C,2
1223 C.setDependsOn(A, 1)
1224
1225 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
1226 D.setDependsOn(C, 2)
1227
1228 # Walk the entire tree
1229 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1230 self.waitUntilSettled()
1231 self.assertEqual(len(self.history), 3)
1232
1233 # Verify that walking just part of the tree still works
1234 self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1))
1235 self.waitUntilSettled()
1236 self.assertEqual(len(self.history), 6)
1237
James E. Blaircaec0c52012-08-22 14:52:22 -07001238 def test_dependent_changes_dequeue(self):
1239 "Test that dependent patches are not needlessly tested"
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001240
James E. Blaircaec0c52012-08-22 14:52:22 -07001241 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1242 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1243 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001244 A.addApproval('Code-Review', 2)
1245 B.addApproval('Code-Review', 2)
1246 C.addApproval('Code-Review', 2)
James E. Blaircaec0c52012-08-22 14:52:22 -07001247
1248 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
1249 M1.setMerged()
1250
1251 # C -> B -> A -> M1
1252
1253 C.setDependsOn(B, 1)
1254 B.setDependsOn(A, 1)
1255 A.setDependsOn(M1, 1)
1256
Paul Belanger174a8272017-03-14 13:20:10 -04001257 self.executor_server.failJob('project-merge', A)
James E. Blaircaec0c52012-08-22 14:52:22 -07001258
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001259 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
1260 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
1261 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blaircaec0c52012-08-22 14:52:22 -07001262
1263 self.waitUntilSettled()
1264
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001265 self.assertEqual(A.data['status'], 'NEW')
1266 self.assertEqual(A.reported, 2)
1267 self.assertEqual(B.data['status'], 'NEW')
1268 self.assertEqual(B.reported, 2)
1269 self.assertEqual(C.data['status'], 'NEW')
James E. Blair0d3e83b2017-06-05 13:51:57 -07001270 self.assertIn('This change depends on a change that failed to merge.',
1271 C.messages[-1])
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001272 self.assertEqual(len(self.history), 1)
James E. Blairec590122012-08-22 15:19:31 -07001273
James E. Blair972e3c72013-08-29 12:04:55 -07001274 def test_failing_dependent_changes(self):
1275 "Test that failing dependent patches are taken out of stream"
Paul Belanger174a8272017-03-14 13:20:10 -04001276 self.executor_server.hold_jobs_in_build = True
James E. Blair972e3c72013-08-29 12:04:55 -07001277 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1278 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1279 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1280 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
1281 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001282 A.addApproval('Code-Review', 2)
1283 B.addApproval('Code-Review', 2)
1284 C.addApproval('Code-Review', 2)
1285 D.addApproval('Code-Review', 2)
1286 E.addApproval('Code-Review', 2)
James E. Blair972e3c72013-08-29 12:04:55 -07001287
1288 # E, D -> C -> B, A
1289
1290 D.setDependsOn(C, 1)
1291 C.setDependsOn(B, 1)
1292
Paul Belanger174a8272017-03-14 13:20:10 -04001293 self.executor_server.failJob('project-test1', B)
James E. Blair972e3c72013-08-29 12:04:55 -07001294
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001295 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
1296 self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
1297 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
1298 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
1299 self.fake_gerrit.addEvent(E.addApproval('Approved', 1))
James E. Blair972e3c72013-08-29 12:04:55 -07001300
1301 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001302 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001303 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001304 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001305 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001306 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001307 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001308 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001309 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001310 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001311 self.waitUntilSettled()
1312
Paul Belanger174a8272017-03-14 13:20:10 -04001313 self.executor_server.hold_jobs_in_build = False
James E. Blair972e3c72013-08-29 12:04:55 -07001314 for build in self.builds:
James E. Blaire3db2952017-07-21 15:03:36 -07001315 if build.parameters['zuul']['change'] != '1':
James E. Blair972e3c72013-08-29 12:04:55 -07001316 build.release()
1317 self.waitUntilSettled()
1318
Paul Belanger174a8272017-03-14 13:20:10 -04001319 self.executor_server.release()
James E. Blair972e3c72013-08-29 12:04:55 -07001320 self.waitUntilSettled()
1321
1322 self.assertEqual(A.data['status'], 'MERGED')
1323 self.assertEqual(A.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001324 self.assertIn('Build succeeded', A.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001325 self.assertEqual(B.data['status'], 'NEW')
1326 self.assertEqual(B.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001327 self.assertIn('Build failed', B.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001328 self.assertEqual(C.data['status'], 'NEW')
1329 self.assertEqual(C.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001330 self.assertIn('depends on a change', C.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001331 self.assertEqual(D.data['status'], 'NEW')
1332 self.assertEqual(D.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001333 self.assertIn('depends on a change', D.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001334 self.assertEqual(E.data['status'], 'MERGED')
1335 self.assertEqual(E.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001336 self.assertIn('Build succeeded', E.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001337 self.assertEqual(len(self.history), 18)
1338
James E. Blairec590122012-08-22 15:19:31 -07001339 def test_head_is_dequeued_once(self):
James E. Blair2fa50962013-01-30 21:50:41 -08001340 "Test that if a change at the head fails it is dequeued only once"
James E. Blairec590122012-08-22 15:19:31 -07001341 # If it's dequeued more than once, we should see extra
1342 # aborted jobs.
James E. Blairec590122012-08-22 15:19:31 -07001343
Paul Belanger174a8272017-03-14 13:20:10 -04001344 self.executor_server.hold_jobs_in_build = True
James E. Blair6df67132017-04-19 13:53:20 -07001345 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1346 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1347 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001348 A.addApproval('Code-Review', 2)
1349 B.addApproval('Code-Review', 2)
1350 C.addApproval('Code-Review', 2)
James E. Blairec590122012-08-22 15:19:31 -07001351
Paul Belanger174a8272017-03-14 13:20:10 -04001352 self.executor_server.failJob('project-test1', A)
1353 self.executor_server.failJob('project-test2', A)
James E. Blairec590122012-08-22 15:19:31 -07001354
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001355 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
1356 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
1357 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blairec590122012-08-22 15:19:31 -07001358
1359 self.waitUntilSettled()
James E. Blairec590122012-08-22 15:19:31 -07001360
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001361 self.assertEqual(len(self.builds), 1)
Paul Belanger58bf6912016-11-11 19:36:01 -05001362 self.assertEqual(self.builds[0].name, 'project-merge')
1363 self.assertTrue(self.builds[0].hasChanges(A))
James E. Blairec590122012-08-22 15:19:31 -07001364
Paul Belanger174a8272017-03-14 13:20:10 -04001365 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001366 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001367 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001368 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001369 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001370 self.waitUntilSettled()
1371
James E. Blair6df67132017-04-19 13:53:20 -07001372 self.assertEqual(len(self.builds), 6)
Paul Belanger58bf6912016-11-11 19:36:01 -05001373 self.assertEqual(self.builds[0].name, 'project-test1')
1374 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair6df67132017-04-19 13:53:20 -07001375 self.assertEqual(self.builds[2].name, 'project-test1')
1376 self.assertEqual(self.builds[3].name, 'project-test2')
1377 self.assertEqual(self.builds[4].name, 'project-test1')
1378 self.assertEqual(self.builds[5].name, 'project-test2')
James E. Blairec590122012-08-22 15:19:31 -07001379
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001380 self.release(self.builds[0])
James E. Blairec590122012-08-22 15:19:31 -07001381 self.waitUntilSettled()
1382
James E. Blair6df67132017-04-19 13:53:20 -07001383 self.assertEqual(len(self.builds), 2) # test2, merge for B
1384 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 4)
James E. Blairec590122012-08-22 15:19:31 -07001385
Paul Belanger174a8272017-03-14 13:20:10 -04001386 self.executor_server.hold_jobs_in_build = False
1387 self.executor_server.release()
James E. Blairec590122012-08-22 15:19:31 -07001388 self.waitUntilSettled()
1389
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001390 self.assertEqual(len(self.builds), 0)
James E. Blair6df67132017-04-19 13:53:20 -07001391 self.assertEqual(len(self.history), 15)
James E. Blaircaec0c52012-08-22 14:52:22 -07001392
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001393 self.assertEqual(A.data['status'], 'NEW')
1394 self.assertEqual(B.data['status'], 'MERGED')
1395 self.assertEqual(C.data['status'], 'MERGED')
1396 self.assertEqual(A.reported, 2)
1397 self.assertEqual(B.reported, 2)
1398 self.assertEqual(C.reported, 2)
James E. Blair4ec821f2012-08-23 15:28:28 -07001399
James E. Blaircc020532017-04-19 13:04:44 -07001400 @simple_layout('layouts/nonvoting-job.yaml')
James E. Blair4ec821f2012-08-23 15:28:28 -07001401 def test_nonvoting_job(self):
1402 "Test that non-voting jobs don't vote."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001403
James E. Blair4ec821f2012-08-23 15:28:28 -07001404 A = self.fake_gerrit.addFakeChange('org/nonvoting-project',
1405 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001406 A.addApproval('Code-Review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04001407 self.executor_server.failJob('nonvoting-project-test2', A)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001408 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair4ec821f2012-08-23 15:28:28 -07001409
1410 self.waitUntilSettled()
James E. Blair4ec821f2012-08-23 15:28:28 -07001411
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001412 self.assertEqual(A.data['status'], 'MERGED')
1413 self.assertEqual(A.reported, 2)
1414 self.assertEqual(
1415 self.getJobFromHistory('nonvoting-project-merge').result,
1416 'SUCCESS')
1417 self.assertEqual(
1418 self.getJobFromHistory('nonvoting-project-test1').result,
1419 'SUCCESS')
1420 self.assertEqual(
1421 self.getJobFromHistory('nonvoting-project-test2').result,
1422 'FAILURE')
James E. Blaire0487072012-08-29 17:38:31 -07001423
James E. Blair2ef29e92017-07-21 15:25:05 -07001424 self.assertTrue(self.getJobFromHistory('nonvoting-project-merge').
1425 parameters['zuul']['voting'])
1426 self.assertTrue(self.getJobFromHistory('nonvoting-project-test1').
1427 parameters['zuul']['voting'])
1428 self.assertFalse(self.getJobFromHistory('nonvoting-project-test2').
1429 parameters['zuul']['voting'])
James E. Blair5821bd92015-09-16 08:48:15 -07001430
James E. Blaire0487072012-08-29 17:38:31 -07001431 def test_check_queue_success(self):
1432 "Test successful check queue jobs."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001433
James E. Blaire0487072012-08-29 17:38:31 -07001434 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1435 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1436
1437 self.waitUntilSettled()
James E. Blaire0487072012-08-29 17:38:31 -07001438
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001439 self.assertEqual(A.data['status'], 'NEW')
1440 self.assertEqual(A.reported, 1)
1441 self.assertEqual(self.getJobFromHistory('project-merge').result,
1442 'SUCCESS')
1443 self.assertEqual(self.getJobFromHistory('project-test1').result,
1444 'SUCCESS')
1445 self.assertEqual(self.getJobFromHistory('project-test2').result,
1446 'SUCCESS')
James E. Blaire0487072012-08-29 17:38:31 -07001447
1448 def test_check_queue_failure(self):
1449 "Test failed check queue jobs."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001450
James E. Blaire0487072012-08-29 17:38:31 -07001451 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belanger174a8272017-03-14 13:20:10 -04001452 self.executor_server.failJob('project-test2', A)
James E. Blaire0487072012-08-29 17:38:31 -07001453 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1454
1455 self.waitUntilSettled()
James E. Blaire0487072012-08-29 17:38:31 -07001456
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001457 self.assertEqual(A.data['status'], 'NEW')
1458 self.assertEqual(A.reported, 1)
1459 self.assertEqual(self.getJobFromHistory('project-merge').result,
James E. Blair78e31b32013-07-09 09:11:34 -07001460 'SUCCESS')
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001461 self.assertEqual(self.getJobFromHistory('project-test1').result,
1462 'SUCCESS')
1463 self.assertEqual(self.getJobFromHistory('project-test2').result,
1464 'FAILURE')
James E. Blair127bc182012-08-28 15:55:15 -07001465
David Shrewsburyffab07a2017-07-24 12:45:07 -04001466 @simple_layout('layouts/autohold.yaml')
1467 def test_autohold(self):
David Shrewsburyffab07a2017-07-24 12:45:07 -04001468 client = zuul.rpcclient.RPCClient('127.0.0.1',
1469 self.gearman_server.port)
1470 self.addCleanup(client.shutdown)
David Shrewsbury36b2adf2017-07-31 15:40:13 -04001471 r = client.autohold('tenant-one', 'org/project', 'project-test2',
1472 "reason text", 1)
David Shrewsburyffab07a2017-07-24 12:45:07 -04001473 self.assertTrue(r)
1474
Clark Boylanaeb5a122017-10-20 14:00:11 -07001475 # First check that successful jobs do not autohold
1476 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
David Shrewsburyffab07a2017-07-24 12:45:07 -04001477 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1478
1479 self.waitUntilSettled()
1480
1481 self.assertEqual(A.data['status'], 'NEW')
1482 self.assertEqual(A.reported, 1)
Clark Boylanaeb5a122017-10-20 14:00:11 -07001483 # project-test2
1484 self.assertEqual(self.history[0].result, 'SUCCESS')
1485
1486 # Check nodepool for a held node
1487 held_node = None
1488 for node in self.fake_nodepool.getNodes():
1489 if node['state'] == zuul.model.STATE_HOLD:
1490 held_node = node
1491 break
1492 self.assertIsNone(held_node)
1493
1494 # Now test that failed jobs are autoheld
1495 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1496 self.executor_server.failJob('project-test2', B)
1497 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1498
1499 self.waitUntilSettled()
1500
1501 self.assertEqual(B.data['status'], 'NEW')
1502 self.assertEqual(B.reported, 1)
1503 # project-test2
1504 self.assertEqual(self.history[1].result, 'FAILURE')
David Shrewsburyffab07a2017-07-24 12:45:07 -04001505
1506 # Check nodepool for a held node
1507 held_node = None
1508 for node in self.fake_nodepool.getNodes():
1509 if node['state'] == zuul.model.STATE_HOLD:
1510 held_node = node
1511 break
1512 self.assertIsNotNone(held_node)
1513
1514 # Validate node has recorded the failed job
1515 self.assertEqual(
1516 held_node['hold_job'],
1517 " ".join(['tenant-one',
1518 'review.example.com/org/project',
1519 'project-test2'])
1520 )
David Shrewsburyf9af9df2017-08-01 15:19:26 -04001521 self.assertEqual(held_node['comment'], "reason text")
David Shrewsburyffab07a2017-07-24 12:45:07 -04001522
1523 # Another failed change should not hold any more nodes
Clark Boylanaeb5a122017-10-20 14:00:11 -07001524 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1525 self.executor_server.failJob('project-test2', C)
1526 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
David Shrewsburyffab07a2017-07-24 12:45:07 -04001527 self.waitUntilSettled()
Clark Boylanaeb5a122017-10-20 14:00:11 -07001528 self.assertEqual(C.data['status'], 'NEW')
1529 self.assertEqual(C.reported, 1)
1530 # project-test2
1531 self.assertEqual(self.history[2].result, 'FAILURE')
David Shrewsburyffab07a2017-07-24 12:45:07 -04001532
1533 held_nodes = 0
1534 for node in self.fake_nodepool.getNodes():
1535 if node['state'] == zuul.model.STATE_HOLD:
1536 held_nodes += 1
1537 self.assertEqual(held_nodes, 1)
1538
David Shrewsburyc4676132017-10-16 12:41:57 -04001539 @simple_layout('layouts/autohold.yaml')
Clark Boylanaeb5a122017-10-20 14:00:11 -07001540 def test_autohold_ignores_aborted_jobs(self):
1541 client = zuul.rpcclient.RPCClient('127.0.0.1',
1542 self.gearman_server.port)
1543 self.addCleanup(client.shutdown)
1544 r = client.autohold('tenant-one', 'org/project', 'project-test2',
1545 "reason text", 1)
1546 self.assertTrue(r)
1547
1548 self.executor_server.hold_jobs_in_build = True
1549
1550 # Create a change that will have its job aborted
1551 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1552 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1553 self.waitUntilSettled()
1554
1555 # Creating new patchset on change A will abort A,1's job because
1556 # a new patchset arrived replacing A,1 with A,2.
1557 A.addPatchset()
1558 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
1559
1560 self.waitUntilSettled()
1561 self.executor_server.hold_jobs_in_build = False
1562 self.executor_server.release()
1563 self.waitUntilSettled()
1564
1565 self.assertEqual(A.data['status'], 'NEW')
1566 # Note only the successful job for A,2 will report as we don't
1567 # report aborted builds for old patchsets.
1568 self.assertEqual(A.reported, 1)
1569 # A,1 project-test2
1570 self.assertEqual(self.history[0].result, 'ABORTED')
1571 # A,2 project-test2
1572 self.assertEqual(self.history[1].result, 'SUCCESS')
1573
1574 # Check nodepool for a held node
1575 held_node = None
1576 for node in self.fake_nodepool.getNodes():
1577 if node['state'] == zuul.model.STATE_HOLD:
1578 held_node = node
1579 break
1580 self.assertIsNone(held_node)
1581
1582 @simple_layout('layouts/autohold.yaml')
David Shrewsburyc4676132017-10-16 12:41:57 -04001583 def test_autohold_list(self):
1584 client = zuul.rpcclient.RPCClient('127.0.0.1',
1585 self.gearman_server.port)
1586 self.addCleanup(client.shutdown)
1587
1588 r = client.autohold('tenant-one', 'org/project', 'project-test2',
1589 "reason text", 1)
1590 self.assertTrue(r)
1591
1592 autohold_requests = client.autohold_list()
1593 self.assertNotEqual({}, autohold_requests)
1594 self.assertEqual(1, len(autohold_requests.keys()))
1595
1596 # The single dict key should be a CSV string value
1597 key = list(autohold_requests.keys())[0]
1598 tenant, project, job = key.split(',')
1599
1600 self.assertEqual('tenant-one', tenant)
1601 self.assertIn('org/project', project)
1602 self.assertEqual('project-test2', job)
1603
1604 # Note: the value is converted from set to list by json.
1605 self.assertEqual([1, "reason text"], autohold_requests[key])
1606
James E. Blair7cb84542017-04-19 13:35:05 -07001607 @simple_layout('layouts/three-projects.yaml')
James E. Blair127bc182012-08-28 15:55:15 -07001608 def test_dependent_behind_dequeue(self):
Clint Byruma9626572017-02-22 14:04:00 -05001609 # This particular test does a large amount of merges and needs a little
1610 # more time to complete
James E. Blair267e5162017-04-07 10:08:20 -07001611 self.wait_timeout = 120
James E. Blair127bc182012-08-28 15:55:15 -07001612 "test that dependent changes behind dequeued changes work"
1613 # This complicated test is a reproduction of a real life bug
1614 self.sched.reconfigure(self.config)
James E. Blair127bc182012-08-28 15:55:15 -07001615
Paul Belanger174a8272017-03-14 13:20:10 -04001616 self.executor_server.hold_jobs_in_build = True
James E. Blair127bc182012-08-28 15:55:15 -07001617 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
1618 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
1619 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
1620 D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D')
1621 E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E')
1622 F = self.fake_gerrit.addFakeChange('org/project3', 'master', 'F')
1623 D.setDependsOn(C, 1)
1624 E.setDependsOn(D, 1)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001625 A.addApproval('Code-Review', 2)
1626 B.addApproval('Code-Review', 2)
1627 C.addApproval('Code-Review', 2)
1628 D.addApproval('Code-Review', 2)
1629 E.addApproval('Code-Review', 2)
1630 F.addApproval('Code-Review', 2)
James E. Blair127bc182012-08-28 15:55:15 -07001631
1632 A.fail_merge = True
James E. Blair127bc182012-08-28 15:55:15 -07001633
1634 # Change object re-use in the gerrit trigger is hidden if
1635 # changes are added in quick succession; waiting makes it more
1636 # like real life.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001637 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001638 self.waitUntilSettled()
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001639 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001640 self.waitUntilSettled()
1641
Paul Belanger174a8272017-03-14 13:20:10 -04001642 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001643 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001644 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001645 self.waitUntilSettled()
1646
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001647 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001648 self.waitUntilSettled()
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001649 self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001650 self.waitUntilSettled()
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001651 self.fake_gerrit.addEvent(E.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001652 self.waitUntilSettled()
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001653 self.fake_gerrit.addEvent(F.addApproval('Approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001654 self.waitUntilSettled()
1655
Paul Belanger174a8272017-03-14 13:20:10 -04001656 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001657 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001658 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001659 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001660 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001661 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001662 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001663 self.waitUntilSettled()
1664
1665 # all jobs running
James E. Blaire955e062012-10-08 09:49:03 -07001666
1667 # Grab pointers to the jobs we want to release before
1668 # releasing any, because list indexes may change as
1669 # the jobs complete.
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001670 a, b, c = self.builds[:3]
James E. Blaire955e062012-10-08 09:49:03 -07001671 a.release()
1672 b.release()
1673 c.release()
James E. Blair127bc182012-08-28 15:55:15 -07001674 self.waitUntilSettled()
1675
Paul Belanger174a8272017-03-14 13:20:10 -04001676 self.executor_server.hold_jobs_in_build = False
1677 self.executor_server.release()
James E. Blair127bc182012-08-28 15:55:15 -07001678 self.waitUntilSettled()
1679
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001680 self.assertEqual(A.data['status'], 'NEW')
1681 self.assertEqual(B.data['status'], 'MERGED')
1682 self.assertEqual(C.data['status'], 'MERGED')
1683 self.assertEqual(D.data['status'], 'MERGED')
1684 self.assertEqual(E.data['status'], 'MERGED')
1685 self.assertEqual(F.data['status'], 'MERGED')
James E. Blair127bc182012-08-28 15:55:15 -07001686
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001687 self.assertEqual(A.reported, 2)
1688 self.assertEqual(B.reported, 2)
1689 self.assertEqual(C.reported, 2)
1690 self.assertEqual(D.reported, 2)
1691 self.assertEqual(E.reported, 2)
1692 self.assertEqual(F.reported, 2)
James E. Blair127bc182012-08-28 15:55:15 -07001693
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001694 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 15)
1695 self.assertEqual(len(self.history), 44)
James E. Blair05fed602012-09-07 12:45:24 -07001696
1697 def test_merger_repack(self):
1698 "Test that the merger works after a repack"
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001699
James E. Blair05fed602012-09-07 12:45:24 -07001700 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001701 A.addApproval('Code-Review', 2)
1702 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair05fed602012-09-07 12:45:24 -07001703 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001704 self.assertEqual(self.getJobFromHistory('project-merge').result,
1705 'SUCCESS')
1706 self.assertEqual(self.getJobFromHistory('project-test1').result,
1707 'SUCCESS')
1708 self.assertEqual(self.getJobFromHistory('project-test2').result,
1709 'SUCCESS')
1710 self.assertEqual(A.data['status'], 'MERGED')
1711 self.assertEqual(A.reported, 2)
James E. Blair05fed602012-09-07 12:45:24 -07001712 self.assertEmptyQueues()
Paul Belanger5bfe9e72016-11-04 19:20:04 -04001713 self.build_history = []
James E. Blair05fed602012-09-07 12:45:24 -07001714
James E. Blair2a535672017-04-27 12:03:15 -07001715 path = os.path.join(self.merger_src_root, "review.example.com",
1716 "org/project")
James E. Blair8c1be532017-02-07 14:04:12 -08001717 if os.path.exists(path):
1718 repack_repo(path)
James E. Blair2a535672017-04-27 12:03:15 -07001719 path = os.path.join(self.executor_src_root, "review.example.com",
1720 "org/project")
James E. Blair8c1be532017-02-07 14:04:12 -08001721 if os.path.exists(path):
1722 repack_repo(path)
James E. Blair05fed602012-09-07 12:45:24 -07001723
1724 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001725 A.addApproval('Code-Review', 2)
1726 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair05fed602012-09-07 12:45:24 -07001727 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001728 self.assertEqual(self.getJobFromHistory('project-merge').result,
1729 'SUCCESS')
1730 self.assertEqual(self.getJobFromHistory('project-test1').result,
1731 'SUCCESS')
1732 self.assertEqual(self.getJobFromHistory('project-test2').result,
1733 'SUCCESS')
1734 self.assertEqual(A.data['status'], 'MERGED')
1735 self.assertEqual(A.reported, 2)
James E. Blair7ee88a22012-09-12 18:59:31 +02001736
James E. Blair4886f282012-11-15 09:27:33 -08001737 def test_merger_repack_large_change(self):
1738 "Test that the merger works with large changes after a repack"
Paul Belanger174a8272017-03-14 13:20:10 -04001739 # https://bugs.executepad.net/zuul/+bug/1078946
James E. Blairac2c3242014-01-24 13:38:51 -08001740 # This test assumes the repo is already cloned; make sure it is
Paul Belanger503bded2016-11-11 19:43:38 -05001741 tenant = self.sched.abide.tenants.get('tenant-one')
James E. Blair6df67132017-04-19 13:53:20 -07001742 trusted, project = tenant.getProject('org/project')
James E. Blair0ffa0102017-03-30 13:11:33 -07001743 url = self.fake_gerrit.getGitUrl(project)
James E. Blair8d144dc2017-05-05 10:13:45 -07001744 self.executor_server.merger._addProject('review.example.com',
James E. Blair197e8202017-06-09 12:54:28 -07001745 'org/project', url, None)
James E. Blair6df67132017-04-19 13:53:20 -07001746 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair4886f282012-11-15 09:27:33 -08001747 A.addPatchset(large=True)
James E. Blair2a535672017-04-27 12:03:15 -07001748 # TODOv3(jeblair): add hostname to upstream root
1749 path = os.path.join(self.upstream_root, 'org/project')
James E. Blair8c1be532017-02-07 14:04:12 -08001750 repack_repo(path)
James E. Blair2a535672017-04-27 12:03:15 -07001751 path = os.path.join(self.merger_src_root, 'review.example.com',
1752 'org/project')
James E. Blair8c1be532017-02-07 14:04:12 -08001753 if os.path.exists(path):
1754 repack_repo(path)
James E. Blair2a535672017-04-27 12:03:15 -07001755 path = os.path.join(self.executor_src_root, 'review.example.com',
1756 'org/project')
James E. Blair8c1be532017-02-07 14:04:12 -08001757 if os.path.exists(path):
1758 repack_repo(path)
James E. Blair4886f282012-11-15 09:27:33 -08001759
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001760 A.addApproval('Code-Review', 2)
1761 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair4886f282012-11-15 09:27:33 -08001762 self.waitUntilSettled()
Paul Belanger503bded2016-11-11 19:43:38 -05001763 self.assertEqual(self.getJobFromHistory('project-merge').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001764 'SUCCESS')
Paul Belanger503bded2016-11-11 19:43:38 -05001765 self.assertEqual(self.getJobFromHistory('project-test1').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001766 'SUCCESS')
Paul Belanger503bded2016-11-11 19:43:38 -05001767 self.assertEqual(self.getJobFromHistory('project-test2').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001768 'SUCCESS')
1769 self.assertEqual(A.data['status'], 'MERGED')
1770 self.assertEqual(A.reported, 2)
James E. Blair4886f282012-11-15 09:27:33 -08001771
James E. Blair2fa50962013-01-30 21:50:41 -08001772 def test_new_patchset_dequeues_old(self):
1773 "Test that a new patchset causes the old to be dequeued"
1774 # D -> C (depends on B) -> B (depends on A) -> A -> M
Paul Belanger174a8272017-03-14 13:20:10 -04001775 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08001776 M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M')
1777 M.setMerged()
1778
1779 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1780 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1781 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1782 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001783 A.addApproval('Code-Review', 2)
1784 B.addApproval('Code-Review', 2)
1785 C.addApproval('Code-Review', 2)
1786 D.addApproval('Code-Review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08001787
1788 C.setDependsOn(B, 1)
1789 B.setDependsOn(A, 1)
1790 A.setDependsOn(M, 1)
1791
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001792 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
1793 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
1794 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
1795 self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08001796 self.waitUntilSettled()
1797
1798 B.addPatchset()
1799 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1800 self.waitUntilSettled()
1801
Paul Belanger174a8272017-03-14 13:20:10 -04001802 self.executor_server.hold_jobs_in_build = False
1803 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08001804 self.waitUntilSettled()
1805
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001806 self.assertEqual(A.data['status'], 'MERGED')
1807 self.assertEqual(A.reported, 2)
1808 self.assertEqual(B.data['status'], 'NEW')
1809 self.assertEqual(B.reported, 2)
1810 self.assertEqual(C.data['status'], 'NEW')
1811 self.assertEqual(C.reported, 2)
1812 self.assertEqual(D.data['status'], 'MERGED')
1813 self.assertEqual(D.reported, 2)
1814 self.assertEqual(len(self.history), 9) # 3 each for A, B, D.
James E. Blair2fa50962013-01-30 21:50:41 -08001815
James E. Blairba437362015-02-07 11:41:52 -08001816 def test_new_patchset_check(self):
1817 "Test a new patchset in check"
Antoine Mussobd86a312014-01-08 14:51:33 +01001818
Paul Belanger174a8272017-03-14 13:20:10 -04001819 self.executor_server.hold_jobs_in_build = True
Antoine Mussobd86a312014-01-08 14:51:33 +01001820
1821 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blairba437362015-02-07 11:41:52 -08001822 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger18e5f632016-11-03 15:24:16 -04001823 tenant = self.sched.abide.tenants.get('tenant-one')
1824 check_pipeline = tenant.layout.pipelines['check']
James E. Blairba437362015-02-07 11:41:52 -08001825
1826 # Add two git-dependent changes
1827 B.setDependsOn(A, 1)
1828 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1829 self.waitUntilSettled()
Antoine Mussobd86a312014-01-08 14:51:33 +01001830 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1831 self.waitUntilSettled()
James E. Blairba437362015-02-07 11:41:52 -08001832
1833 # A live item, and a non-live/live pair
1834 items = check_pipeline.getAllItems()
1835 self.assertEqual(len(items), 3)
1836
1837 self.assertEqual(items[0].change.number, '1')
1838 self.assertEqual(items[0].change.patchset, '1')
1839 self.assertFalse(items[0].live)
1840
1841 self.assertEqual(items[1].change.number, '2')
1842 self.assertEqual(items[1].change.patchset, '1')
1843 self.assertTrue(items[1].live)
1844
1845 self.assertEqual(items[2].change.number, '1')
1846 self.assertEqual(items[2].change.patchset, '1')
1847 self.assertTrue(items[2].live)
1848
1849 # Add a new patchset to A
1850 A.addPatchset()
1851 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
1852 self.waitUntilSettled()
1853
1854 # The live copy of A,1 should be gone, but the non-live and B
1855 # should continue, and we should have a new A,2
1856 items = check_pipeline.getAllItems()
1857 self.assertEqual(len(items), 3)
1858
1859 self.assertEqual(items[0].change.number, '1')
1860 self.assertEqual(items[0].change.patchset, '1')
1861 self.assertFalse(items[0].live)
1862
1863 self.assertEqual(items[1].change.number, '2')
1864 self.assertEqual(items[1].change.patchset, '1')
1865 self.assertTrue(items[1].live)
1866
1867 self.assertEqual(items[2].change.number, '1')
1868 self.assertEqual(items[2].change.patchset, '2')
1869 self.assertTrue(items[2].live)
1870
1871 # Add a new patchset to B
1872 B.addPatchset()
1873 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1874 self.waitUntilSettled()
1875
1876 # The live copy of B,1 should be gone, and it's non-live copy of A,1
1877 # but we should have a new B,2 (still based on A,1)
1878 items = check_pipeline.getAllItems()
1879 self.assertEqual(len(items), 3)
1880
1881 self.assertEqual(items[0].change.number, '1')
1882 self.assertEqual(items[0].change.patchset, '2')
1883 self.assertTrue(items[0].live)
1884
1885 self.assertEqual(items[1].change.number, '1')
1886 self.assertEqual(items[1].change.patchset, '1')
1887 self.assertFalse(items[1].live)
1888
1889 self.assertEqual(items[2].change.number, '2')
1890 self.assertEqual(items[2].change.patchset, '2')
1891 self.assertTrue(items[2].live)
1892
1893 self.builds[0].release()
1894 self.waitUntilSettled()
1895 self.builds[0].release()
1896 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001897 self.executor_server.hold_jobs_in_build = False
1898 self.executor_server.release()
James E. Blairba437362015-02-07 11:41:52 -08001899 self.waitUntilSettled()
1900
1901 self.assertEqual(A.reported, 1)
1902 self.assertEqual(B.reported, 1)
1903 self.assertEqual(self.history[0].result, 'ABORTED')
1904 self.assertEqual(self.history[0].changes, '1,1')
1905 self.assertEqual(self.history[1].result, 'ABORTED')
1906 self.assertEqual(self.history[1].changes, '1,1 2,1')
1907 self.assertEqual(self.history[2].result, 'SUCCESS')
1908 self.assertEqual(self.history[2].changes, '1,2')
1909 self.assertEqual(self.history[3].result, 'SUCCESS')
1910 self.assertEqual(self.history[3].changes, '1,1 2,2')
1911
1912 def test_abandoned_gate(self):
1913 "Test that an abandoned change is dequeued from gate"
1914
Paul Belanger174a8272017-03-14 13:20:10 -04001915 self.executor_server.hold_jobs_in_build = True
James E. Blairba437362015-02-07 11:41:52 -08001916
1917 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02001918 A.addApproval('Code-Review', 2)
1919 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blairba437362015-02-07 11:41:52 -08001920 self.waitUntilSettled()
Antoine Mussobd86a312014-01-08 14:51:33 +01001921 self.assertEqual(len(self.builds), 1, "One job being built (on hold)")
1922 self.assertEqual(self.builds[0].name, 'project-merge')
1923
1924 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
1925 self.waitUntilSettled()
1926
Paul Belanger174a8272017-03-14 13:20:10 -04001927 self.executor_server.release('.*-merge')
Antoine Mussobd86a312014-01-08 14:51:33 +01001928 self.waitUntilSettled()
1929
Arie5b4048c2016-10-05 16:12:06 +03001930 self.assertBuilds([])
1931 self.assertHistory([
1932 dict(name='project-merge', result='ABORTED', changes='1,1')],
1933 ordered=False)
James E. Blairba437362015-02-07 11:41:52 -08001934 self.assertEqual(A.reported, 1,
1935 "Abandoned gate change should report only start")
1936
1937 def test_abandoned_check(self):
1938 "Test that an abandoned change is dequeued from check"
1939
Paul Belanger174a8272017-03-14 13:20:10 -04001940 self.executor_server.hold_jobs_in_build = True
James E. Blairba437362015-02-07 11:41:52 -08001941
1942 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1943 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger18e5f632016-11-03 15:24:16 -04001944 tenant = self.sched.abide.tenants.get('tenant-one')
1945 check_pipeline = tenant.layout.pipelines['check']
James E. Blairba437362015-02-07 11:41:52 -08001946
1947 # Add two git-dependent changes
1948 B.setDependsOn(A, 1)
1949 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1950 self.waitUntilSettled()
1951 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1952 self.waitUntilSettled()
1953 # A live item, and a non-live/live pair
1954 items = check_pipeline.getAllItems()
1955 self.assertEqual(len(items), 3)
1956
1957 self.assertEqual(items[0].change.number, '1')
1958 self.assertFalse(items[0].live)
1959
1960 self.assertEqual(items[1].change.number, '2')
1961 self.assertTrue(items[1].live)
1962
1963 self.assertEqual(items[2].change.number, '1')
1964 self.assertTrue(items[2].live)
1965
1966 # Abandon A
1967 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
1968 self.waitUntilSettled()
1969
1970 # The live copy of A should be gone, but the non-live and B
1971 # should continue
1972 items = check_pipeline.getAllItems()
1973 self.assertEqual(len(items), 2)
1974
1975 self.assertEqual(items[0].change.number, '1')
1976 self.assertFalse(items[0].live)
1977
1978 self.assertEqual(items[1].change.number, '2')
1979 self.assertTrue(items[1].live)
1980
Paul Belanger174a8272017-03-14 13:20:10 -04001981 self.executor_server.hold_jobs_in_build = False
1982 self.executor_server.release()
James E. Blairba437362015-02-07 11:41:52 -08001983 self.waitUntilSettled()
1984
1985 self.assertEqual(len(self.history), 4)
1986 self.assertEqual(self.history[0].result, 'ABORTED',
Antoine Mussobd86a312014-01-08 14:51:33 +01001987 'Build should have been aborted')
1988 self.assertEqual(A.reported, 0, "Abandoned change should not report")
James E. Blairba437362015-02-07 11:41:52 -08001989 self.assertEqual(B.reported, 1, "Change should report")
Antoine Mussobd86a312014-01-08 14:51:33 +01001990
Steve Varnau7b78b312015-04-03 14:49:46 -07001991 def test_abandoned_not_timer(self):
1992 "Test that an abandoned change does not cancel timer jobs"
James E. Blairdfdfcfc2017-04-20 10:19:20 -07001993 # This test can not use simple_layout because it must start
1994 # with a configuration which does not include a
1995 # timer-triggered job so that we have an opportunity to set
1996 # the hold flag before the first job.
Paul Belanger174a8272017-03-14 13:20:10 -04001997 self.executor_server.hold_jobs_in_build = True
Steve Varnau7b78b312015-04-03 14:49:46 -07001998 # Start timer trigger - also org/project
James E. Blairdfdfcfc2017-04-20 10:19:20 -07001999 self.commitConfigUpdate('common-config', 'layouts/idle.yaml')
Steve Varnau7b78b312015-04-03 14:49:46 -07002000 self.sched.reconfigure(self.config)
Steve Varnau7b78b312015-04-03 14:49:46 -07002001 # The pipeline triggers every second, so we should have seen
2002 # several by now.
2003 time.sleep(5)
2004 self.waitUntilSettled()
2005 # Stop queuing timer triggered jobs so that the assertions
2006 # below don't race against more jobs being queued.
Clint Byrumead6c562017-02-01 16:34:04 -08002007 # Must be in same repo, so overwrite config with another one
James E. Blairdfdfcfc2017-04-20 10:19:20 -07002008 self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml')
Steve Varnau7b78b312015-04-03 14:49:46 -07002009 self.sched.reconfigure(self.config)
James E. Blair0b137b42017-07-27 08:51:25 -07002010 self.waitUntilSettled()
James E. Blair78ae4782017-08-02 14:19:10 -07002011 # If APScheduler is in mid-event when we remove the job, we
2012 # can end up with one more event firing, so give it an extra
2013 # second to settle.
2014 time.sleep(1)
2015 self.waitUntilSettled()
James E. Blairdfdfcfc2017-04-20 10:19:20 -07002016
James E. Blair21037782017-07-19 11:56:55 -07002017 self.assertEqual(len(self.builds), 1, "One timer job")
Steve Varnau7b78b312015-04-03 14:49:46 -07002018
2019 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2020 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2021 self.waitUntilSettled()
James E. Blair21037782017-07-19 11:56:55 -07002022 self.assertEqual(len(self.builds), 2, "One change plus one timer job")
Steve Varnau7b78b312015-04-03 14:49:46 -07002023
2024 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
2025 self.waitUntilSettled()
2026
James E. Blair21037782017-07-19 11:56:55 -07002027 self.assertEqual(len(self.builds), 1, "One timer job remains")
Steve Varnau7b78b312015-04-03 14:49:46 -07002028
Paul Belanger174a8272017-03-14 13:20:10 -04002029 self.executor_server.release()
Steve Varnau7b78b312015-04-03 14:49:46 -07002030 self.waitUntilSettled()
2031
James E. Blair2fa50962013-01-30 21:50:41 -08002032 def test_new_patchset_dequeues_old_on_head(self):
2033 "Test that a new patchset causes the old to be dequeued (at head)"
2034 # D -> C (depends on B) -> B (depends on A) -> A -> M
Paul Belanger174a8272017-03-14 13:20:10 -04002035 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08002036 M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M')
2037 M.setMerged()
2038 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2039 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2040 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
2041 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002042 A.addApproval('Code-Review', 2)
2043 B.addApproval('Code-Review', 2)
2044 C.addApproval('Code-Review', 2)
2045 D.addApproval('Code-Review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08002046
2047 C.setDependsOn(B, 1)
2048 B.setDependsOn(A, 1)
2049 A.setDependsOn(M, 1)
2050
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002051 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
2052 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
2053 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
2054 self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08002055 self.waitUntilSettled()
2056
2057 A.addPatchset()
2058 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
2059 self.waitUntilSettled()
2060
Paul Belanger174a8272017-03-14 13:20:10 -04002061 self.executor_server.hold_jobs_in_build = False
2062 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08002063 self.waitUntilSettled()
2064
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002065 self.assertEqual(A.data['status'], 'NEW')
2066 self.assertEqual(A.reported, 2)
2067 self.assertEqual(B.data['status'], 'NEW')
2068 self.assertEqual(B.reported, 2)
2069 self.assertEqual(C.data['status'], 'NEW')
2070 self.assertEqual(C.reported, 2)
2071 self.assertEqual(D.data['status'], 'MERGED')
2072 self.assertEqual(D.reported, 2)
2073 self.assertEqual(len(self.history), 7)
James E. Blair2fa50962013-01-30 21:50:41 -08002074
2075 def test_new_patchset_dequeues_old_without_dependents(self):
2076 "Test that a new patchset causes only the old to be dequeued"
Paul Belanger174a8272017-03-14 13:20:10 -04002077 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08002078 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2079 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2080 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002081 A.addApproval('Code-Review', 2)
2082 B.addApproval('Code-Review', 2)
2083 C.addApproval('Code-Review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08002084
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002085 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
2086 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
2087 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08002088 self.waitUntilSettled()
2089
2090 B.addPatchset()
2091 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
2092 self.waitUntilSettled()
2093
Paul Belanger174a8272017-03-14 13:20:10 -04002094 self.executor_server.hold_jobs_in_build = False
2095 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08002096 self.waitUntilSettled()
2097
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002098 self.assertEqual(A.data['status'], 'MERGED')
2099 self.assertEqual(A.reported, 2)
2100 self.assertEqual(B.data['status'], 'NEW')
2101 self.assertEqual(B.reported, 2)
2102 self.assertEqual(C.data['status'], 'MERGED')
2103 self.assertEqual(C.reported, 2)
2104 self.assertEqual(len(self.history), 9)
James E. Blair2fa50962013-01-30 21:50:41 -08002105
2106 def test_new_patchset_dequeues_old_independent_queue(self):
2107 "Test that a new patchset causes the old to be dequeued (independent)"
Paul Belanger174a8272017-03-14 13:20:10 -04002108 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08002109 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2110 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2111 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
2112 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2113 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
2114 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
2115 self.waitUntilSettled()
2116
2117 B.addPatchset()
2118 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
2119 self.waitUntilSettled()
2120
Paul Belanger174a8272017-03-14 13:20:10 -04002121 self.executor_server.hold_jobs_in_build = False
2122 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08002123 self.waitUntilSettled()
2124
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002125 self.assertEqual(A.data['status'], 'NEW')
2126 self.assertEqual(A.reported, 1)
2127 self.assertEqual(B.data['status'], 'NEW')
2128 self.assertEqual(B.reported, 1)
2129 self.assertEqual(C.data['status'], 'NEW')
2130 self.assertEqual(C.reported, 1)
2131 self.assertEqual(len(self.history), 10)
2132 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1)
James E. Blair7d0dedc2013-02-21 17:26:09 -08002133
James E. Blaircc020532017-04-19 13:04:44 -07002134 @simple_layout('layouts/noop-job.yaml')
James E. Blair18c64442014-03-18 10:14:45 -07002135 def test_noop_job(self):
2136 "Test that the internal noop job works"
2137 A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002138 A.addApproval('Code-Review', 2)
2139 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair18c64442014-03-18 10:14:45 -07002140 self.waitUntilSettled()
2141
2142 self.assertEqual(len(self.gearman_server.getQueue()), 0)
2143 self.assertTrue(self.sched._areAllBuildsComplete())
2144 self.assertEqual(len(self.history), 0)
2145 self.assertEqual(A.data['status'], 'MERGED')
2146 self.assertEqual(A.reported, 2)
2147
James E. Blair06cc3922017-04-19 10:08:10 -07002148 @simple_layout('layouts/no-jobs-project.yaml')
Evgeny Antyshevd6e546c2015-06-11 15:13:57 +00002149 def test_no_job_project(self):
2150 "Test that reports with no jobs don't get sent"
2151 A = self.fake_gerrit.addFakeChange('org/no-jobs-project',
2152 'master', 'A')
2153 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2154 self.waitUntilSettled()
2155
2156 # Change wasn't reported to
2157 self.assertEqual(A.reported, False)
2158
2159 # Check queue is empty afterwards
Clint Byrum883c30e2016-12-13 11:54:33 -08002160 tenant = self.sched.abide.tenants.get('tenant-one')
2161 check_pipeline = tenant.layout.pipelines['check']
Evgeny Antyshevd6e546c2015-06-11 15:13:57 +00002162 items = check_pipeline.getAllItems()
2163 self.assertEqual(len(items), 0)
2164
2165 self.assertEqual(len(self.history), 0)
2166
James E. Blair7d0dedc2013-02-21 17:26:09 -08002167 def test_zuul_refs(self):
2168 "Test that zuul refs exist and have the right changes"
Paul Belanger174a8272017-03-14 13:20:10 -04002169 self.executor_server.hold_jobs_in_build = True
James E. Blair7d0dedc2013-02-21 17:26:09 -08002170 M1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'M1')
2171 M1.setMerged()
2172 M2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'M2')
2173 M2.setMerged()
2174
2175 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2176 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
2177 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
2178 D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002179 A.addApproval('Code-Review', 2)
2180 B.addApproval('Code-Review', 2)
2181 C.addApproval('Code-Review', 2)
2182 D.addApproval('Code-Review', 2)
2183 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
2184 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
2185 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
2186 self.fake_gerrit.addEvent(D.addApproval('Approved', 1))
James E. Blair7d0dedc2013-02-21 17:26:09 -08002187
2188 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002189 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08002190 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002191 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08002192 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002193 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08002194 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002195 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08002196 self.waitUntilSettled()
2197
Clint Byrum3343e3e2016-11-15 16:05:03 -08002198 a_build = b_build = c_build = d_build = None
Monty Taylor6bef8ef2013-06-02 08:17:12 -04002199 for x in self.builds:
James E. Blaire3db2952017-07-21 15:03:36 -07002200 if x.parameters['zuul']['change'] == '3':
Clint Byrum3343e3e2016-11-15 16:05:03 -08002201 a_build = x
James E. Blaire3db2952017-07-21 15:03:36 -07002202 elif x.parameters['zuul']['change'] == '4':
Clint Byrum3343e3e2016-11-15 16:05:03 -08002203 b_build = x
James E. Blaire3db2952017-07-21 15:03:36 -07002204 elif x.parameters['zuul']['change'] == '5':
Clint Byrum3343e3e2016-11-15 16:05:03 -08002205 c_build = x
James E. Blaire3db2952017-07-21 15:03:36 -07002206 elif x.parameters['zuul']['change'] == '6':
Clint Byrum3343e3e2016-11-15 16:05:03 -08002207 d_build = x
2208 if a_build and b_build and c_build and d_build:
2209 break
James E. Blair7d0dedc2013-02-21 17:26:09 -08002210
Clint Byrum3343e3e2016-11-15 16:05:03 -08002211 # should have a, not b, and should not be in project2
2212 self.assertTrue(a_build.hasChanges(A))
2213 self.assertFalse(a_build.hasChanges(B, M2))
James E. Blair7d0dedc2013-02-21 17:26:09 -08002214
Clint Byrum3343e3e2016-11-15 16:05:03 -08002215 # should have a and b, and should not be in project2
2216 self.assertTrue(b_build.hasChanges(A, B))
2217 self.assertFalse(b_build.hasChanges(M2))
James E. Blair7d0dedc2013-02-21 17:26:09 -08002218
Clint Byrum3343e3e2016-11-15 16:05:03 -08002219 # should have a and b in 1, c in 2
2220 self.assertTrue(c_build.hasChanges(A, B, C))
2221 self.assertFalse(c_build.hasChanges(D))
James E. Blair7d0dedc2013-02-21 17:26:09 -08002222
Clint Byrum3343e3e2016-11-15 16:05:03 -08002223 # should have a and b in 1, c and d in 2
2224 self.assertTrue(d_build.hasChanges(A, B, C, D))
James E. Blair7d0dedc2013-02-21 17:26:09 -08002225
Paul Belanger174a8272017-03-14 13:20:10 -04002226 self.executor_server.hold_jobs_in_build = False
2227 self.executor_server.release()
James E. Blair7d0dedc2013-02-21 17:26:09 -08002228 self.waitUntilSettled()
2229
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002230 self.assertEqual(A.data['status'], 'MERGED')
2231 self.assertEqual(A.reported, 2)
2232 self.assertEqual(B.data['status'], 'MERGED')
2233 self.assertEqual(B.reported, 2)
2234 self.assertEqual(C.data['status'], 'MERGED')
2235 self.assertEqual(C.reported, 2)
2236 self.assertEqual(D.data['status'], 'MERGED')
2237 self.assertEqual(D.reported, 2)
James E. Blair70c71582013-03-06 08:50:50 -08002238
James E. Blair4a28a882013-08-23 15:17:33 -07002239 def test_rerun_on_error(self):
2240 "Test that if a worker fails to run a job, it is run again"
Paul Belanger174a8272017-03-14 13:20:10 -04002241 self.executor_server.hold_jobs_in_build = True
James E. Blair4a28a882013-08-23 15:17:33 -07002242 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002243 A.addApproval('Code-Review', 2)
2244 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair4a28a882013-08-23 15:17:33 -07002245 self.waitUntilSettled()
2246
James E. Blair412fba82017-01-26 15:00:50 -08002247 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04002248 self.executor_server.hold_jobs_in_build = False
2249 self.executor_server.release()
James E. Blair4a28a882013-08-23 15:17:33 -07002250 self.waitUntilSettled()
James E. Blair412fba82017-01-26 15:00:50 -08002251 self.assertEqual(self.countJobResults(self.history, None), 1)
James E. Blair4a28a882013-08-23 15:17:33 -07002252 self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3)
2253
James E. Blair412e5582013-04-22 15:50:12 -07002254 def test_statsd(self):
2255 "Test each of the statsd methods used in the scheduler"
James E. Blairded241e2017-10-10 13:22:40 -07002256 statsd = self.sched.statsd
James E. Blair412e5582013-04-22 15:50:12 -07002257 statsd.incr('test-incr')
2258 statsd.timing('test-timing', 3)
Alex Gaynor813d39b2014-05-17 16:17:16 -07002259 statsd.gauge('test-gauge', 12)
James E. Blair412e5582013-04-22 15:50:12 -07002260 self.assertReportedStat('test-incr', '1|c')
2261 self.assertReportedStat('test-timing', '3|ms')
Alex Gaynor813d39b2014-05-17 16:17:16 -07002262 self.assertReportedStat('test-gauge', '12|g')
James E. Blair412e5582013-04-22 15:50:12 -07002263
James E. Blairdad52252014-02-07 16:59:17 -08002264 def test_stuck_job_cleanup(self):
2265 "Test that pending jobs are cleaned up if removed from layout"
Clint Byrum678e2c32017-03-16 16:27:21 -07002266
2267 # We want to hold the project-merge job that the fake change enqueues
James E. Blairdad52252014-02-07 16:59:17 -08002268 self.gearman_server.hold_jobs_in_queue = True
2269 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002270 A.addApproval('Code-Review', 2)
2271 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blairdad52252014-02-07 16:59:17 -08002272 self.waitUntilSettled()
Clint Byrum678e2c32017-03-16 16:27:21 -07002273 # The assertion is that we have one job in the queue, project-merge
James E. Blairdad52252014-02-07 16:59:17 -08002274 self.assertEqual(len(self.gearman_server.getQueue()), 1)
2275
James E. Blair31cb3e82017-04-20 13:08:56 -07002276 self.commitConfigUpdate('common-config', 'layouts/no-jobs.yaml')
James E. Blairdad52252014-02-07 16:59:17 -08002277 self.sched.reconfigure(self.config)
2278 self.waitUntilSettled()
2279
James E. Blair18c64442014-03-18 10:14:45 -07002280 self.gearman_server.release('gate-noop')
James E. Blairdad52252014-02-07 16:59:17 -08002281 self.waitUntilSettled()
Clint Byrum678e2c32017-03-16 16:27:21 -07002282 # asserting that project-merge is removed from queue
James E. Blairdad52252014-02-07 16:59:17 -08002283 self.assertEqual(len(self.gearman_server.getQueue()), 0)
2284 self.assertTrue(self.sched._areAllBuildsComplete())
2285
2286 self.assertEqual(len(self.history), 1)
James E. Blair18c64442014-03-18 10:14:45 -07002287 self.assertEqual(self.history[0].name, 'gate-noop')
James E. Blairdad52252014-02-07 16:59:17 -08002288 self.assertEqual(self.history[0].result, 'SUCCESS')
2289
James E. Blair879dafb2015-07-17 14:04:49 -07002290 def test_file_head(self):
2291 # This is a regression test for an observed bug. A change
2292 # with a file named "HEAD" in the root directory of the repo
2293 # was processed by a merger. It then was unable to reset the
2294 # repo because of:
2295 # GitCommandError: 'git reset --hard HEAD' returned
2296 # with exit code 128
2297 # stderr: 'fatal: ambiguous argument 'HEAD': both revision
2298 # and filename
2299 # Use '--' to separate filenames from revisions'
2300
2301 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belangera91095f2016-11-04 19:28:48 -04002302 A.addPatchset({'HEAD': ''})
James E. Blair879dafb2015-07-17 14:04:49 -07002303 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2304
2305 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
2306 self.waitUntilSettled()
2307
2308 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
2309 self.waitUntilSettled()
2310
2311 self.assertIn('Build succeeded', A.messages[0])
2312 self.assertIn('Build succeeded', B.messages[0])
2313
James E. Blair70c71582013-03-06 08:50:50 -08002314 def test_file_jobs(self):
2315 "Test that file jobs run only when appropriate"
2316 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Adam Gandelman5661bda2017-02-03 15:58:03 -08002317 A.addPatchset({'pip-requires': 'foo'})
James E. Blair70c71582013-03-06 08:50:50 -08002318 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002319 A.addApproval('Code-Review', 2)
2320 B.addApproval('Code-Review', 2)
2321 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
2322 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair70c71582013-03-06 08:50:50 -08002323 self.waitUntilSettled()
2324
Monty Taylor6bef8ef2013-06-02 08:17:12 -04002325 testfile_jobs = [x for x in self.history
James E. Blair70c71582013-03-06 08:50:50 -08002326 if x.name == 'project-testfile']
2327
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002328 self.assertEqual(len(testfile_jobs), 1)
2329 self.assertEqual(testfile_jobs[0].changes, '1,2')
2330 self.assertEqual(A.data['status'], 'MERGED')
2331 self.assertEqual(A.reported, 2)
2332 self.assertEqual(B.data['status'], 'MERGED')
2333 self.assertEqual(B.reported, 2)
James E. Blair3c5e5b52013-04-26 11:17:03 -07002334
Clint Byrum3ee39f32016-11-17 23:45:07 -08002335 def _test_irrelevant_files_jobs(self, should_skip):
2336 "Test that jobs with irrelevant-files filter run only when appropriate"
Clint Byrum3ee39f32016-11-17 23:45:07 -08002337 if should_skip:
2338 files = {'ignoreme': 'ignored\n'}
2339 else:
2340 files = {'respectme': 'please!\n'}
Maru Newby3fe5f852015-01-13 04:22:14 +00002341
2342 change = self.fake_gerrit.addFakeChange('org/project',
Clint Byrum3ee39f32016-11-17 23:45:07 -08002343 'master',
2344 'test irrelevant-files',
2345 files=files)
Maru Newby3fe5f852015-01-13 04:22:14 +00002346 self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1))
2347 self.waitUntilSettled()
2348
2349 tested_change_ids = [x.changes[0] for x in self.history
Clint Byrum3ee39f32016-11-17 23:45:07 -08002350 if x.name == 'project-test-irrelevant-files']
Maru Newby3fe5f852015-01-13 04:22:14 +00002351
2352 if should_skip:
2353 self.assertEqual([], tested_change_ids)
2354 else:
2355 self.assertIn(change.data['number'], tested_change_ids)
2356
James E. Blaircc324192017-04-19 14:36:08 -07002357 @simple_layout('layouts/irrelevant-files.yaml')
Clint Byrum3ee39f32016-11-17 23:45:07 -08002358 def test_irrelevant_files_match_skips_job(self):
2359 self._test_irrelevant_files_jobs(should_skip=True)
Maru Newby3fe5f852015-01-13 04:22:14 +00002360
James E. Blaircc324192017-04-19 14:36:08 -07002361 @simple_layout('layouts/irrelevant-files.yaml')
Clint Byrum3ee39f32016-11-17 23:45:07 -08002362 def test_irrelevant_files_no_match_runs_job(self):
2363 self._test_irrelevant_files_jobs(should_skip=False)
Maru Newby3fe5f852015-01-13 04:22:14 +00002364
James E. Blaircc324192017-04-19 14:36:08 -07002365 @simple_layout('layouts/inheritance.yaml')
Clint Byrum85493602016-11-18 11:59:47 -08002366 def test_inherited_jobs_keep_matchers(self):
Clint Byrum85493602016-11-18 11:59:47 -08002367 files = {'ignoreme': 'ignored\n'}
2368
2369 change = self.fake_gerrit.addFakeChange('org/project',
2370 'master',
2371 'test irrelevant-files',
2372 files=files)
2373 self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1))
2374 self.waitUntilSettled()
2375
2376 run_jobs = set([build.name for build in self.history])
2377
2378 self.assertEqual(set(['project-test-nomatch-starts-empty',
2379 'project-test-nomatch-starts-full']), run_jobs)
2380
James E. Blairaf8b2082017-10-03 15:38:27 -07002381 @simple_layout('layouts/job-vars.yaml')
2382 def test_inherited_job_variables(self):
2383 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2384 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2385 self.waitUntilSettled()
2386 self.assertHistory([
2387 dict(name='parentjob', result='SUCCESS'),
2388 dict(name='child1', result='SUCCESS'),
2389 dict(name='child2', result='SUCCESS'),
2390 dict(name='child3', result='SUCCESS'),
2391 ], ordered=False)
2392 j = self.getJobFromHistory('parentjob')
2393 rp = set([p['name'] for p in j.parameters['projects']])
2394 self.assertEqual(j.parameters['vars']['override'], 0)
2395 self.assertEqual(j.parameters['vars']['child1override'], 0)
2396 self.assertEqual(j.parameters['vars']['parent'], 0)
2397 self.assertFalse('child1' in j.parameters['vars'])
2398 self.assertFalse('child2' in j.parameters['vars'])
2399 self.assertFalse('child3' in j.parameters['vars'])
2400 self.assertEqual(rp, set(['org/project', 'org/project0',
2401 'org/project0']))
2402 j = self.getJobFromHistory('child1')
2403 rp = set([p['name'] for p in j.parameters['projects']])
2404 self.assertEqual(j.parameters['vars']['override'], 1)
2405 self.assertEqual(j.parameters['vars']['child1override'], 1)
2406 self.assertEqual(j.parameters['vars']['parent'], 0)
2407 self.assertEqual(j.parameters['vars']['child1'], 1)
2408 self.assertFalse('child2' in j.parameters['vars'])
2409 self.assertFalse('child3' in j.parameters['vars'])
2410 self.assertEqual(rp, set(['org/project', 'org/project0',
2411 'org/project1']))
2412 j = self.getJobFromHistory('child2')
2413 rp = set([p['name'] for p in j.parameters['projects']])
2414 self.assertEqual(j.parameters['vars']['override'], 2)
2415 self.assertEqual(j.parameters['vars']['child1override'], 0)
2416 self.assertEqual(j.parameters['vars']['parent'], 0)
2417 self.assertFalse('child1' in j.parameters['vars'])
2418 self.assertEqual(j.parameters['vars']['child2'], 2)
2419 self.assertFalse('child3' in j.parameters['vars'])
2420 self.assertEqual(rp, set(['org/project', 'org/project0',
2421 'org/project2']))
2422 j = self.getJobFromHistory('child3')
2423 rp = set([p['name'] for p in j.parameters['projects']])
2424 self.assertEqual(j.parameters['vars']['override'], 3)
2425 self.assertEqual(j.parameters['vars']['child1override'], 0)
2426 self.assertEqual(j.parameters['vars']['parent'], 0)
2427 self.assertFalse('child1' in j.parameters['vars'])
2428 self.assertFalse('child2' in j.parameters['vars'])
2429 self.assertEqual(j.parameters['vars']['child3'], 3)
2430 self.assertEqual(rp, set(['org/project', 'org/project0',
2431 'org/project3']))
2432
James E. Blairc8a1e052014-02-25 09:29:26 -08002433 def test_queue_names(self):
2434 "Test shared change queue names"
Paul Belanger8e68fc22017-02-06 16:24:49 -05002435 tenant = self.sched.abide.tenants.get('tenant-one')
James E. Blair6053de42017-04-05 11:27:11 -07002436 (trusted, project1) = tenant.getProject('org/project1')
2437 (trusted, project2) = tenant.getProject('org/project2')
Paul Belanger8e68fc22017-02-06 16:24:49 -05002438 q1 = tenant.layout.pipelines['gate'].getQueue(project1)
2439 q2 = tenant.layout.pipelines['gate'].getQueue(project2)
2440 self.assertEqual(q1.name, 'integrated')
2441 self.assertEqual(q2.name, 'integrated')
James E. Blairc8a1e052014-02-25 09:29:26 -08002442
James E. Blair64ed6f22013-07-10 14:07:23 -07002443 def test_queue_precedence(self):
2444 "Test that queue precedence works"
2445
2446 self.gearman_server.hold_jobs_in_queue = True
Paul Belanger174a8272017-03-14 13:20:10 -04002447 self.executor_server.hold_jobs_in_build = True
James E. Blair64ed6f22013-07-10 14:07:23 -07002448 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2449 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002450 A.addApproval('Code-Review', 2)
2451 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair64ed6f22013-07-10 14:07:23 -07002452
2453 self.waitUntilSettled()
2454 self.gearman_server.hold_jobs_in_queue = False
2455 self.gearman_server.release()
2456 self.waitUntilSettled()
2457
James E. Blair8de58bd2013-07-18 16:23:33 -07002458 # Run one build at a time to ensure non-race order:
James E. Blairb8c16472015-05-05 14:55:26 -07002459 self.orderedRelease()
Paul Belanger174a8272017-03-14 13:20:10 -04002460 self.executor_server.hold_jobs_in_build = False
James E. Blair8de58bd2013-07-18 16:23:33 -07002461 self.waitUntilSettled()
2462
James E. Blair64ed6f22013-07-10 14:07:23 -07002463 self.log.debug(self.history)
2464 self.assertEqual(self.history[0].pipeline, 'gate')
2465 self.assertEqual(self.history[1].pipeline, 'check')
2466 self.assertEqual(self.history[2].pipeline, 'gate')
2467 self.assertEqual(self.history[3].pipeline, 'gate')
2468 self.assertEqual(self.history[4].pipeline, 'check')
2469 self.assertEqual(self.history[5].pipeline, 'check')
2470
Clark Boylana5edbe42014-06-03 16:39:10 -07002471 def test_json_status(self):
James E. Blair1843a552013-07-03 14:19:52 -07002472 "Test that we can retrieve JSON status info"
Paul Belanger174a8272017-03-14 13:20:10 -04002473 self.executor_server.hold_jobs_in_build = True
James E. Blair1843a552013-07-03 14:19:52 -07002474 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002475 A.addApproval('Code-Review', 2)
2476 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair1843a552013-07-03 14:19:52 -07002477 self.waitUntilSettled()
2478
Paul Belanger174a8272017-03-14 13:20:10 -04002479 self.executor_server.release('project-merge')
James E. Blairb7273ef2016-04-19 08:58:51 -07002480 self.waitUntilSettled()
2481
James E. Blair1843a552013-07-03 14:19:52 -07002482 port = self.webapp.server.socket.getsockname()[1]
2483
Adam Gandelman77a12c72017-02-03 17:43:43 -08002484 req = urllib.request.Request(
2485 "http://localhost:%s/tenant-one/status" % port)
Morgan Fainberg293f7f82016-05-30 14:01:22 -07002486 f = urllib.request.urlopen(req)
Clark Boylanaa4f2e72014-06-03 21:22:40 -07002487 headers = f.info()
2488 self.assertIn('Content-Length', headers)
2489 self.assertIn('Content-Type', headers)
Sachi Kingdc963fc2016-03-23 16:00:33 +11002490 self.assertIsNotNone(re.match('^application/json(; charset=UTF-8)?$',
2491 headers['Content-Type']))
Timo Tijhof0ebd2932015-04-02 12:11:21 +01002492 self.assertIn('Access-Control-Allow-Origin', headers)
2493 self.assertIn('Cache-Control', headers)
Clark Boylanaa4f2e72014-06-03 21:22:40 -07002494 self.assertIn('Last-Modified', headers)
Timo Tijhof0ebd2932015-04-02 12:11:21 +01002495 self.assertIn('Expires', headers)
Clint Byrumf322fe22017-05-10 20:53:12 -07002496 data = f.read().decode('utf8')
James E. Blair1843a552013-07-03 14:19:52 -07002497
Paul Belanger174a8272017-03-14 13:20:10 -04002498 self.executor_server.hold_jobs_in_build = False
2499 self.executor_server.release()
James E. Blair1843a552013-07-03 14:19:52 -07002500 self.waitUntilSettled()
2501
2502 data = json.loads(data)
James E. Blairb7273ef2016-04-19 08:58:51 -07002503 status_jobs = []
James E. Blair1843a552013-07-03 14:19:52 -07002504 for p in data['pipelines']:
2505 for q in p['change_queues']:
James E. Blairbfb8e042014-12-30 17:01:44 -08002506 if p['name'] in ['gate', 'conflict']:
Clark Boylanaf2476f2014-01-23 14:47:36 -08002507 self.assertEqual(q['window'], 20)
2508 else:
2509 self.assertEqual(q['window'], 0)
James E. Blair1843a552013-07-03 14:19:52 -07002510 for head in q['heads']:
2511 for change in head:
Clark Boylanaf2476f2014-01-23 14:47:36 -08002512 self.assertTrue(change['active'])
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002513 self.assertEqual(change['id'], '1,1')
James E. Blair1843a552013-07-03 14:19:52 -07002514 for job in change['jobs']:
James E. Blairb7273ef2016-04-19 08:58:51 -07002515 status_jobs.append(job)
2516 self.assertEqual('project-merge', status_jobs[0]['name'])
Monty Taylorde8242c2017-02-23 20:29:53 -06002517 # TODO(mordred) pull uuids from self.builds
Monty Taylor51139a02016-05-24 11:28:10 -05002518 self.assertEqual(
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002519 'static/stream.html?uuid={uuid}&logfile=console.log'.format(
2520 uuid=status_jobs[0]['uuid']),
2521 status_jobs[0]['url'])
2522 self.assertEqual(
Monty Taylor51139a02016-05-24 11:28:10 -05002523 'finger://{hostname}/{uuid}'.format(
2524 hostname=self.executor_server.hostname,
2525 uuid=status_jobs[0]['uuid']),
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002526 status_jobs[0]['finger_url'])
Monty Taylorde8242c2017-02-23 20:29:53 -06002527 # TOOD(mordred) configure a success-url on the base job
Monty Taylor51139a02016-05-24 11:28:10 -05002528 self.assertEqual(
2529 'finger://{hostname}/{uuid}'.format(
2530 hostname=self.executor_server.hostname,
2531 uuid=status_jobs[0]['uuid']),
2532 status_jobs[0]['report_url'])
James E. Blairb7273ef2016-04-19 08:58:51 -07002533 self.assertEqual('project-test1', status_jobs[1]['name'])
Monty Taylor51139a02016-05-24 11:28:10 -05002534 self.assertEqual(
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002535 'static/stream.html?uuid={uuid}&logfile=console.log'.format(
2536 uuid=status_jobs[1]['uuid']),
2537 status_jobs[1]['url'])
2538 self.assertEqual(
Monty Taylor51139a02016-05-24 11:28:10 -05002539 'finger://{hostname}/{uuid}'.format(
2540 hostname=self.executor_server.hostname,
2541 uuid=status_jobs[1]['uuid']),
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002542 status_jobs[1]['finger_url'])
Monty Taylor51139a02016-05-24 11:28:10 -05002543 self.assertEqual(
2544 'finger://{hostname}/{uuid}'.format(
2545 hostname=self.executor_server.hostname,
2546 uuid=status_jobs[1]['uuid']),
2547 status_jobs[1]['report_url'])
James E. Blairb7273ef2016-04-19 08:58:51 -07002548
2549 self.assertEqual('project-test2', status_jobs[2]['name'])
Monty Taylor51139a02016-05-24 11:28:10 -05002550 self.assertEqual(
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002551 'static/stream.html?uuid={uuid}&logfile=console.log'.format(
2552 uuid=status_jobs[2]['uuid']),
2553 status_jobs[2]['url'])
2554 self.assertEqual(
Monty Taylor51139a02016-05-24 11:28:10 -05002555 'finger://{hostname}/{uuid}'.format(
2556 hostname=self.executor_server.hostname,
2557 uuid=status_jobs[2]['uuid']),
Tobias Henkelb4407fc2017-07-07 13:52:56 +02002558 status_jobs[2]['finger_url'])
Monty Taylor51139a02016-05-24 11:28:10 -05002559 self.assertEqual(
2560 'finger://{hostname}/{uuid}'.format(
2561 hostname=self.executor_server.hostname,
2562 uuid=status_jobs[2]['uuid']),
2563 status_jobs[2]['report_url'])
James E. Blair1843a552013-07-03 14:19:52 -07002564
Tobias Henkel65639f82017-07-10 10:25:42 +02002565 # check job dependencies
2566 self.assertIsNotNone(status_jobs[0]['dependencies'])
2567 self.assertIsNotNone(status_jobs[1]['dependencies'])
2568 self.assertIsNotNone(status_jobs[2]['dependencies'])
2569 self.assertEqual(len(status_jobs[0]['dependencies']), 0)
2570 self.assertEqual(len(status_jobs[1]['dependencies']), 1)
2571 self.assertEqual(len(status_jobs[2]['dependencies']), 1)
2572 self.assertIn('project-merge', status_jobs[1]['dependencies'])
2573 self.assertIn('project-merge', status_jobs[2]['dependencies'])
2574
James E. Blair419a8672017-10-18 14:48:25 -07002575 def test_reconfigure_merge(self):
2576 """Test that two reconfigure events are merged"""
2577
2578 tenant = self.sched.abide.tenants['tenant-one']
2579 (trusted, project) = tenant.getProject('org/project')
2580
2581 self.sched.run_handler_lock.acquire()
2582 self.assertEqual(self.sched.management_event_queue.qsize(), 0)
2583
2584 self.sched.reconfigureTenant(tenant, project)
2585 self.assertEqual(self.sched.management_event_queue.qsize(), 1)
2586
2587 self.sched.reconfigureTenant(tenant, project)
2588 # The second event should have been combined with the first
2589 # so we should still only have one entry.
2590 self.assertEqual(self.sched.management_event_queue.qsize(), 1)
2591
2592 self.sched.run_handler_lock.release()
2593 self.waitUntilSettled()
2594
2595 self.assertEqual(self.sched.management_event_queue.qsize(), 0)
2596
James E. Blaircdccd972013-07-01 12:10:22 -07002597 def test_live_reconfiguration(self):
2598 "Test that live reconfiguration works"
Paul Belanger174a8272017-03-14 13:20:10 -04002599 self.executor_server.hold_jobs_in_build = True
James E. Blaircdccd972013-07-01 12:10:22 -07002600 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002601 A.addApproval('Code-Review', 2)
2602 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blaircdccd972013-07-01 12:10:22 -07002603 self.waitUntilSettled()
2604
2605 self.sched.reconfigure(self.config)
James E. Blairbd963632017-02-01 09:58:14 -08002606 self.waitUntilSettled()
James E. Blaircdccd972013-07-01 12:10:22 -07002607
Paul Belanger174a8272017-03-14 13:20:10 -04002608 self.executor_server.hold_jobs_in_build = False
2609 self.executor_server.release()
James E. Blaircdccd972013-07-01 12:10:22 -07002610 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002611 self.assertEqual(self.getJobFromHistory('project-merge').result,
2612 'SUCCESS')
2613 self.assertEqual(self.getJobFromHistory('project-test1').result,
2614 'SUCCESS')
2615 self.assertEqual(self.getJobFromHistory('project-test2').result,
2616 'SUCCESS')
2617 self.assertEqual(A.data['status'], 'MERGED')
2618 self.assertEqual(A.reported, 2)
James E. Blair287c06d2013-07-24 10:39:30 -07002619
James E. Blair027ba992017-09-20 13:48:32 -07002620 def test_live_reconfiguration_abort(self):
2621 # Raise an exception during reconfiguration and verify we
2622 # still function.
2623 self.executor_server.hold_jobs_in_build = True
2624 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2625 A.addApproval('Code-Review', 2)
2626 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
2627 self.waitUntilSettled()
2628
2629 tenant = self.sched.abide.tenants.get('tenant-one')
2630 pipeline = tenant.layout.pipelines['gate']
2631 change = pipeline.getAllItems()[0].change
2632 # Set this to an invalid value to cause an exception during
2633 # reconfiguration.
2634 change.branch = None
2635
2636 self.sched.reconfigure(self.config)
2637 self.waitUntilSettled()
2638
2639 self.executor_server.hold_jobs_in_build = False
2640 self.executor_server.release()
2641
2642 self.waitUntilSettled()
2643 self.assertEqual(self.getJobFromHistory('project-merge').result,
2644 'ABORTED')
2645 self.assertEqual(A.data['status'], 'NEW')
2646 # The final report fails because of the invalid value set above.
2647 self.assertEqual(A.reported, 1)
2648
James E. Blair6bc782d2015-07-17 16:20:21 -07002649 def test_live_reconfiguration_merge_conflict(self):
2650 # A real-world bug: a change in a gate queue has a merge
2651 # conflict and a job is added to its project while it's
2652 # sitting in the queue. The job gets added to the change and
2653 # enqueued and the change gets stuck.
Paul Belanger174a8272017-03-14 13:20:10 -04002654 self.executor_server.hold_jobs_in_build = True
James E. Blair6bc782d2015-07-17 16:20:21 -07002655
2656 # This change is fine. It's here to stop the queue long
2657 # enough for the next change to be subject to the
2658 # reconfiguration, as well as to provide a conflict for the
2659 # next change. This change will succeed and merge.
2660 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Clint Byrum073c00b2017-05-01 13:41:23 -07002661 A.addPatchset({'conflict': 'A'})
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002662 A.addApproval('Code-Review', 2)
James E. Blair6bc782d2015-07-17 16:20:21 -07002663
2664 # This change will be in merge conflict. During the
2665 # reconfiguration, we will add a job. We want to make sure
2666 # that doesn't cause it to get stuck.
2667 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Clint Byrum073c00b2017-05-01 13:41:23 -07002668 B.addPatchset({'conflict': 'B'})
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002669 B.addApproval('Code-Review', 2)
James E. Blair4eb21fa2015-07-27 14:56:47 -07002670
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002671 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
2672 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002673
2674 self.waitUntilSettled()
2675
2676 # No jobs have run yet
2677 self.assertEqual(A.data['status'], 'NEW')
2678 self.assertEqual(A.reported, 1)
2679 self.assertEqual(B.data['status'], 'NEW')
James E. Blair6bc782d2015-07-17 16:20:21 -07002680 self.assertEqual(len(self.history), 0)
2681
2682 # Add the "project-test3" job.
Clint Byrum073c00b2017-05-01 13:41:23 -07002683 self.commitConfigUpdate('common-config',
2684 'layouts/live-reconfiguration-add-job.yaml')
James E. Blair6bc782d2015-07-17 16:20:21 -07002685 self.sched.reconfigure(self.config)
2686 self.waitUntilSettled()
2687
Paul Belanger174a8272017-03-14 13:20:10 -04002688 self.executor_server.hold_jobs_in_build = False
2689 self.executor_server.release()
James E. Blair6bc782d2015-07-17 16:20:21 -07002690 self.waitUntilSettled()
2691
2692 self.assertEqual(A.data['status'], 'MERGED')
2693 self.assertEqual(A.reported, 2)
2694 self.assertEqual(B.data['status'], 'NEW')
Tobias Henkel9842bd72017-05-16 13:40:03 +02002695 self.assertIn('Merge Failed', B.messages[-1])
James E. Blair6bc782d2015-07-17 16:20:21 -07002696 self.assertEqual(self.getJobFromHistory('project-merge').result,
2697 'SUCCESS')
2698 self.assertEqual(self.getJobFromHistory('project-test1').result,
2699 'SUCCESS')
2700 self.assertEqual(self.getJobFromHistory('project-test2').result,
2701 'SUCCESS')
2702 self.assertEqual(self.getJobFromHistory('project-test3').result,
2703 'SUCCESS')
2704 self.assertEqual(len(self.history), 4)
2705
James E. Blair400e8fd2015-07-30 17:44:45 -07002706 def test_live_reconfiguration_failed_root(self):
James E. Blair6bc782d2015-07-17 16:20:21 -07002707 # An extrapolation of test_live_reconfiguration_merge_conflict
2708 # that tests a job added to a job tree with a failed root does
2709 # not run.
Paul Belanger174a8272017-03-14 13:20:10 -04002710 self.executor_server.hold_jobs_in_build = True
James E. Blair6bc782d2015-07-17 16:20:21 -07002711
2712 # This change is fine. It's here to stop the queue long
2713 # enough for the next change to be subject to the
2714 # reconfiguration. This change will succeed and merge.
2715 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Clint Byrum3147d652017-05-01 14:01:42 -07002716 A.addPatchset({'conflict': 'A'})
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002717 A.addApproval('Code-Review', 2)
2718 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002719 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002720 self.executor_server.release('.*-merge')
James E. Blair6bc782d2015-07-17 16:20:21 -07002721 self.waitUntilSettled()
2722
2723 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger174a8272017-03-14 13:20:10 -04002724 self.executor_server.failJob('project-merge', B)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002725 B.addApproval('Code-Review', 2)
2726 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002727 self.waitUntilSettled()
2728
Paul Belanger174a8272017-03-14 13:20:10 -04002729 self.executor_server.release('.*-merge')
James E. Blair6bc782d2015-07-17 16:20:21 -07002730 self.waitUntilSettled()
2731
2732 # Both -merge jobs have run, but no others.
2733 self.assertEqual(A.data['status'], 'NEW')
2734 self.assertEqual(A.reported, 1)
2735 self.assertEqual(B.data['status'], 'NEW')
2736 self.assertEqual(B.reported, 1)
2737 self.assertEqual(self.history[0].result, 'SUCCESS')
2738 self.assertEqual(self.history[0].name, 'project-merge')
2739 self.assertEqual(self.history[1].result, 'FAILURE')
2740 self.assertEqual(self.history[1].name, 'project-merge')
2741 self.assertEqual(len(self.history), 2)
2742
2743 # Add the "project-test3" job.
Clint Byrum3147d652017-05-01 14:01:42 -07002744 self.commitConfigUpdate('common-config',
2745 'layouts/live-reconfiguration-add-job.yaml')
James E. Blair6bc782d2015-07-17 16:20:21 -07002746 self.sched.reconfigure(self.config)
2747 self.waitUntilSettled()
2748
Paul Belanger174a8272017-03-14 13:20:10 -04002749 self.executor_server.hold_jobs_in_build = False
2750 self.executor_server.release()
James E. Blair6bc782d2015-07-17 16:20:21 -07002751 self.waitUntilSettled()
2752
2753 self.assertEqual(A.data['status'], 'MERGED')
2754 self.assertEqual(A.reported, 2)
2755 self.assertEqual(B.data['status'], 'NEW')
2756 self.assertEqual(B.reported, 2)
2757 self.assertEqual(self.history[0].result, 'SUCCESS')
2758 self.assertEqual(self.history[0].name, 'project-merge')
2759 self.assertEqual(self.history[1].result, 'FAILURE')
2760 self.assertEqual(self.history[1].name, 'project-merge')
2761 self.assertEqual(self.history[2].result, 'SUCCESS')
2762 self.assertEqual(self.history[3].result, 'SUCCESS')
2763 self.assertEqual(self.history[4].result, 'SUCCESS')
2764 self.assertEqual(len(self.history), 5)
2765
James E. Blair400e8fd2015-07-30 17:44:45 -07002766 def test_live_reconfiguration_failed_job(self):
2767 # Test that a change with a removed failing job does not
2768 # disrupt reconfiguration. If a change has a failed job and
2769 # that job is removed during a reconfiguration, we observed a
2770 # bug where the code to re-set build statuses would run on
2771 # that build and raise an exception because the job no longer
2772 # existed.
Paul Belanger174a8272017-03-14 13:20:10 -04002773 self.executor_server.hold_jobs_in_build = True
James E. Blair400e8fd2015-07-30 17:44:45 -07002774
2775 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2776
2777 # This change will fail and later be removed by the reconfiguration.
Paul Belanger174a8272017-03-14 13:20:10 -04002778 self.executor_server.failJob('project-test1', A)
James E. Blair400e8fd2015-07-30 17:44:45 -07002779
2780 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2781 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002782 self.executor_server.release('.*-merge')
James E. Blair400e8fd2015-07-30 17:44:45 -07002783 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002784 self.executor_server.release('project-test1')
James E. Blair400e8fd2015-07-30 17:44:45 -07002785 self.waitUntilSettled()
2786
2787 self.assertEqual(A.data['status'], 'NEW')
2788 self.assertEqual(A.reported, 0)
2789
2790 self.assertEqual(self.getJobFromHistory('project-merge').result,
2791 'SUCCESS')
2792 self.assertEqual(self.getJobFromHistory('project-test1').result,
2793 'FAILURE')
2794 self.assertEqual(len(self.history), 2)
2795
2796 # Remove the test1 job.
Clint Byrum841a58c2017-05-01 14:17:21 -07002797 self.commitConfigUpdate('common-config',
2798 'layouts/live-reconfiguration-failed-job.yaml')
James E. Blair400e8fd2015-07-30 17:44:45 -07002799 self.sched.reconfigure(self.config)
2800 self.waitUntilSettled()
2801
Paul Belanger174a8272017-03-14 13:20:10 -04002802 self.executor_server.hold_jobs_in_build = False
2803 self.executor_server.release()
James E. Blair400e8fd2015-07-30 17:44:45 -07002804 self.waitUntilSettled()
2805
2806 self.assertEqual(self.getJobFromHistory('project-test2').result,
2807 'SUCCESS')
2808 self.assertEqual(self.getJobFromHistory('project-testfile').result,
2809 'SUCCESS')
2810 self.assertEqual(len(self.history), 4)
2811
2812 self.assertEqual(A.data['status'], 'NEW')
2813 self.assertEqual(A.reported, 1)
2814 self.assertIn('Build succeeded', A.messages[0])
2815 # Ensure the removed job was not included in the report.
2816 self.assertNotIn('project-test1', A.messages[0])
2817
James E. Blairfe707d12015-08-05 15:18:15 -07002818 def test_live_reconfiguration_shared_queue(self):
2819 # Test that a change with a failing job which was removed from
2820 # this project but otherwise still exists in the system does
2821 # not disrupt reconfiguration.
2822
Paul Belanger174a8272017-03-14 13:20:10 -04002823 self.executor_server.hold_jobs_in_build = True
James E. Blairfe707d12015-08-05 15:18:15 -07002824
2825 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2826
Paul Belanger174a8272017-03-14 13:20:10 -04002827 self.executor_server.failJob('project1-project2-integration', A)
James E. Blairfe707d12015-08-05 15:18:15 -07002828
2829 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2830 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002831 self.executor_server.release('.*-merge')
James E. Blairfe707d12015-08-05 15:18:15 -07002832 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002833 self.executor_server.release('project1-project2-integration')
James E. Blairfe707d12015-08-05 15:18:15 -07002834 self.waitUntilSettled()
2835
2836 self.assertEqual(A.data['status'], 'NEW')
2837 self.assertEqual(A.reported, 0)
2838
Clint Byrum69663d42017-05-01 14:51:04 -07002839 self.assertEqual(self.getJobFromHistory('project-merge').result,
James E. Blairfe707d12015-08-05 15:18:15 -07002840 'SUCCESS')
2841 self.assertEqual(self.getJobFromHistory(
2842 'project1-project2-integration').result, 'FAILURE')
2843 self.assertEqual(len(self.history), 2)
2844
2845 # Remove the integration job.
Clint Byrum69663d42017-05-01 14:51:04 -07002846 self.commitConfigUpdate(
2847 'common-config',
2848 'layouts/live-reconfiguration-shared-queue.yaml')
James E. Blairfe707d12015-08-05 15:18:15 -07002849 self.sched.reconfigure(self.config)
2850 self.waitUntilSettled()
2851
Paul Belanger174a8272017-03-14 13:20:10 -04002852 self.executor_server.hold_jobs_in_build = False
2853 self.executor_server.release()
James E. Blairfe707d12015-08-05 15:18:15 -07002854 self.waitUntilSettled()
2855
Clint Byrum69663d42017-05-01 14:51:04 -07002856 self.assertEqual(self.getJobFromHistory('project-merge').result,
James E. Blairfe707d12015-08-05 15:18:15 -07002857 'SUCCESS')
Clint Byrum69663d42017-05-01 14:51:04 -07002858 self.assertEqual(self.getJobFromHistory('project-test1').result,
James E. Blairfe707d12015-08-05 15:18:15 -07002859 'SUCCESS')
Clint Byrum69663d42017-05-01 14:51:04 -07002860 self.assertEqual(self.getJobFromHistory('project-test2').result,
James E. Blairfe707d12015-08-05 15:18:15 -07002861 'SUCCESS')
2862 self.assertEqual(self.getJobFromHistory(
2863 'project1-project2-integration').result, 'FAILURE')
2864 self.assertEqual(len(self.history), 4)
2865
2866 self.assertEqual(A.data['status'], 'NEW')
2867 self.assertEqual(A.reported, 1)
2868 self.assertIn('Build succeeded', A.messages[0])
2869 # Ensure the removed job was not included in the report.
2870 self.assertNotIn('project1-project2-integration', A.messages[0])
2871
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002872 def test_double_live_reconfiguration_shared_queue(self):
2873 # This was a real-world regression. A change is added to
2874 # gate; a reconfigure happens, a second change which depends
2875 # on the first is added, and a second reconfiguration happens.
2876 # Ensure that both changes merge.
2877
2878 # A failure may indicate incorrect caching or cleaning up of
2879 # references during a reconfiguration.
Paul Belanger174a8272017-03-14 13:20:10 -04002880 self.executor_server.hold_jobs_in_build = True
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002881
2882 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2883 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
2884 B.setDependsOn(A, 1)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002885 A.addApproval('Code-Review', 2)
2886 B.addApproval('Code-Review', 2)
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002887
2888 # Add the parent change.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002889 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002890 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002891 self.executor_server.release('.*-merge')
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002892 self.waitUntilSettled()
2893
2894 # Reconfigure (with only one change in the pipeline).
2895 self.sched.reconfigure(self.config)
2896 self.waitUntilSettled()
2897
2898 # Add the child change.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002899 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002900 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002901 self.executor_server.release('.*-merge')
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002902 self.waitUntilSettled()
2903
2904 # Reconfigure (with both in the pipeline).
2905 self.sched.reconfigure(self.config)
2906 self.waitUntilSettled()
2907
Paul Belanger174a8272017-03-14 13:20:10 -04002908 self.executor_server.hold_jobs_in_build = False
2909 self.executor_server.release()
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002910 self.waitUntilSettled()
2911
2912 self.assertEqual(len(self.history), 8)
2913
2914 self.assertEqual(A.data['status'], 'MERGED')
2915 self.assertEqual(A.reported, 2)
2916 self.assertEqual(B.data['status'], 'MERGED')
2917 self.assertEqual(B.reported, 2)
2918
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002919 def test_live_reconfiguration_del_project(self):
2920 # Test project deletion from layout
2921 # while changes are enqueued
2922
Paul Belanger174a8272017-03-14 13:20:10 -04002923 self.executor_server.hold_jobs_in_build = True
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002924 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2925 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
2926 C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C')
2927
2928 # A Depends-On: B
2929 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
2930 A.subject, B.data['id'])
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002931 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002932
2933 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2934 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
2935 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002936 self.executor_server.release('.*-merge')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002937 self.waitUntilSettled()
2938 self.assertEqual(len(self.builds), 5)
2939
2940 # This layout defines only org/project, not org/project1
James E. Blair31cb3e82017-04-20 13:08:56 -07002941 self.commitConfigUpdate(
2942 'common-config',
2943 'layouts/live-reconfiguration-del-project.yaml')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002944 self.sched.reconfigure(self.config)
2945 self.waitUntilSettled()
2946
2947 # Builds for C aborted, builds for A succeed,
2948 # and have change B applied ahead
Clint Byrum0149ada2017-04-04 12:22:01 -07002949 job_c = self.getJobFromHistory('project-test1')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002950 self.assertEqual(job_c.changes, '3,1')
2951 self.assertEqual(job_c.result, 'ABORTED')
2952
Paul Belanger174a8272017-03-14 13:20:10 -04002953 self.executor_server.hold_jobs_in_build = False
2954 self.executor_server.release()
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002955 self.waitUntilSettled()
2956
Clint Byrum0149ada2017-04-04 12:22:01 -07002957 self.assertEqual(
2958 self.getJobFromHistory('project-test1', 'org/project').changes,
2959 '2,1 1,1')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002960
2961 self.assertEqual(A.data['status'], 'NEW')
2962 self.assertEqual(B.data['status'], 'NEW')
2963 self.assertEqual(C.data['status'], 'NEW')
2964 self.assertEqual(A.reported, 1)
2965 self.assertEqual(B.reported, 0)
2966 self.assertEqual(C.reported, 0)
2967
Clint Byrum0149ada2017-04-04 12:22:01 -07002968 tenant = self.sched.abide.tenants.get('tenant-one')
2969 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002970 self.assertIn('Build succeeded', A.messages[0])
2971
James E. Blair287c06d2013-07-24 10:39:30 -07002972 def test_delayed_repo_init(self):
James E. Blair287c06d2013-07-24 10:39:30 -07002973 self.init_repo("org/new-project")
Clint Byrum627ba362017-08-14 13:20:40 -07002974 files = {'README': ''}
2975 self.addCommitToRepo("org/new-project", 'Initial commit',
2976 files=files, tag='init')
2977 self.newTenantConfig('tenants/delayed-repo-init.yaml')
2978 self.commitConfigUpdate(
2979 'common-config',
2980 'layouts/delayed-repo-init.yaml')
2981 self.sched.reconfigure(self.config)
2982 self.waitUntilSettled()
2983
James E. Blair287c06d2013-07-24 10:39:30 -07002984 A = self.fake_gerrit.addFakeChange('org/new-project', 'master', 'A')
2985
Tobias Henkelbf24fd12017-07-27 06:13:07 +02002986 A.addApproval('Code-Review', 2)
2987 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair287c06d2013-07-24 10:39:30 -07002988 self.waitUntilSettled()
2989 self.assertEqual(self.getJobFromHistory('project-merge').result,
2990 'SUCCESS')
2991 self.assertEqual(self.getJobFromHistory('project-test1').result,
2992 'SUCCESS')
2993 self.assertEqual(self.getJobFromHistory('project-test2').result,
2994 'SUCCESS')
2995 self.assertEqual(A.data['status'], 'MERGED')
2996 self.assertEqual(A.reported, 2)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002997
James E. Blair9ea70072017-04-19 16:05:30 -07002998 @simple_layout('layouts/repo-deleted.yaml')
Clark Boylan6dbbc482013-10-18 10:57:31 -07002999 def test_repo_deleted(self):
Clark Boylan6dbbc482013-10-18 10:57:31 -07003000 self.init_repo("org/delete-project")
3001 A = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'A')
3002
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003003 A.addApproval('Code-Review', 2)
3004 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Clark Boylan6dbbc482013-10-18 10:57:31 -07003005 self.waitUntilSettled()
3006 self.assertEqual(self.getJobFromHistory('project-merge').result,
3007 'SUCCESS')
3008 self.assertEqual(self.getJobFromHistory('project-test1').result,
3009 'SUCCESS')
3010 self.assertEqual(self.getJobFromHistory('project-test2').result,
3011 'SUCCESS')
3012 self.assertEqual(A.data['status'], 'MERGED')
3013 self.assertEqual(A.reported, 2)
3014
3015 # Delete org/new-project zuul repo. Should be recloned.
James E. Blair8c1be532017-02-07 14:04:12 -08003016 p = 'org/delete-project'
Monty Taylord642d852017-02-23 14:05:42 -05003017 if os.path.exists(os.path.join(self.merger_src_root, p)):
3018 shutil.rmtree(os.path.join(self.merger_src_root, p))
Paul Belanger174a8272017-03-14 13:20:10 -04003019 if os.path.exists(os.path.join(self.executor_src_root, p)):
3020 shutil.rmtree(os.path.join(self.executor_src_root, p))
Clark Boylan6dbbc482013-10-18 10:57:31 -07003021
3022 B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B')
3023
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003024 B.addApproval('Code-Review', 2)
3025 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
Clark Boylan6dbbc482013-10-18 10:57:31 -07003026 self.waitUntilSettled()
3027 self.assertEqual(self.getJobFromHistory('project-merge').result,
3028 'SUCCESS')
3029 self.assertEqual(self.getJobFromHistory('project-test1').result,
3030 'SUCCESS')
3031 self.assertEqual(self.getJobFromHistory('project-test2').result,
3032 'SUCCESS')
3033 self.assertEqual(B.data['status'], 'MERGED')
3034 self.assertEqual(B.reported, 2)
3035
James E. Blair892cca62017-08-09 11:36:58 -07003036 @simple_layout('layouts/untrusted-secrets.yaml')
3037 def test_untrusted_secrets(self):
3038 "Test untrusted secrets"
3039 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3040 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3041 self.waitUntilSettled()
3042
3043 self.assertHistory([])
3044 self.assertEqual(A.patchsets[0]['approvals'][0]['value'], "-1")
James E. Blair8eb564a2017-08-10 09:21:41 -07003045 self.assertIn('does not allow post-review job',
James E. Blair892cca62017-08-09 11:36:58 -07003046 A.messages[0])
3047
James E. Blaire68d43f2017-04-19 14:03:30 -07003048 @simple_layout('layouts/tags.yaml')
James E. Blair456f2fb2016-02-09 09:29:33 -08003049 def test_tags(self):
3050 "Test job tags"
James E. Blair456f2fb2016-02-09 09:29:33 -08003051 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3052 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
3053 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3054 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
3055 self.waitUntilSettled()
3056
James E. Blaire68d43f2017-04-19 14:03:30 -07003057 self.assertEqual(len(self.history), 2)
Cullen Taylor3aa6d472017-03-01 15:22:09 -06003058
3059 results = {self.getJobFromHistory('merge',
James E. Blair9d46f092017-07-20 16:06:20 -07003060 project='org/project1').uuid: ['extratag', 'merge'],
Cullen Taylor3aa6d472017-03-01 15:22:09 -06003061 self.getJobFromHistory('merge',
James E. Blair9d46f092017-07-20 16:06:20 -07003062 project='org/project2').uuid: ['merge']}
James E. Blair456f2fb2016-02-09 09:29:33 -08003063
3064 for build in self.history:
Cullen Taylor3aa6d472017-03-01 15:22:09 -06003065 self.assertEqual(results.get(build.uuid, ''),
James E. Blair9d46f092017-07-20 16:06:20 -07003066 build.parameters['zuul'].get('jobtags'))
James E. Blair456f2fb2016-02-09 09:29:33 -08003067
James E. Blair63bb0ef2013-07-29 17:14:51 -07003068 def test_timer(self):
3069 "Test that a periodic job is triggered"
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003070 # This test can not use simple_layout because it must start
3071 # with a configuration which does not include a
3072 # timer-triggered job so that we have an opportunity to set
3073 # the hold flag before the first job.
James E. Blair21037782017-07-19 11:56:55 -07003074 self.create_branch('org/project', 'stable')
Paul Belanger174a8272017-03-14 13:20:10 -04003075 self.executor_server.hold_jobs_in_build = True
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003076 self.commitConfigUpdate('common-config', 'layouts/timer.yaml')
James E. Blair63bb0ef2013-07-29 17:14:51 -07003077 self.sched.reconfigure(self.config)
James E. Blair63bb0ef2013-07-29 17:14:51 -07003078
Clark Boylan3ee090a2014-04-03 20:55:09 -07003079 # The pipeline triggers every second, so we should have seen
3080 # several by now.
3081 time.sleep(5)
James E. Blair63bb0ef2013-07-29 17:14:51 -07003082 self.waitUntilSettled()
Clark Boylan3ee090a2014-04-03 20:55:09 -07003083
3084 self.assertEqual(len(self.builds), 2)
3085
James E. Blair63bb0ef2013-07-29 17:14:51 -07003086 port = self.webapp.server.socket.getsockname()[1]
3087
Clint Byrum5e729e92017-02-08 06:34:57 -08003088 req = urllib.request.Request(
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003089 "http://localhost:%s/tenant-one/status" % port)
Morgan Fainberg293f7f82016-05-30 14:01:22 -07003090 f = urllib.request.urlopen(req)
Clint Byrumf322fe22017-05-10 20:53:12 -07003091 data = f.read().decode('utf8')
James E. Blair63bb0ef2013-07-29 17:14:51 -07003092
Paul Belanger174a8272017-03-14 13:20:10 -04003093 self.executor_server.hold_jobs_in_build = False
Clark Boylan3ee090a2014-04-03 20:55:09 -07003094 # Stop queuing timer triggered jobs so that the assertions
3095 # below don't race against more jobs being queued.
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003096 self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003097 self.sched.reconfigure(self.config)
James E. Blair78ae4782017-08-02 14:19:10 -07003098 self.waitUntilSettled()
3099 # If APScheduler is in mid-event when we remove the job, we
3100 # can end up with one more event firing, so give it an extra
3101 # second to settle.
3102 time.sleep(1)
3103 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003104 self.executor_server.release()
James E. Blair63bb0ef2013-07-29 17:14:51 -07003105 self.waitUntilSettled()
3106
James E. Blair21037782017-07-19 11:56:55 -07003107 self.assertHistory([
3108 dict(name='project-bitrot', result='SUCCESS',
3109 ref='refs/heads/master'),
3110 dict(name='project-bitrot', result='SUCCESS',
3111 ref='refs/heads/stable'),
3112 ], ordered=False)
James E. Blair63bb0ef2013-07-29 17:14:51 -07003113
3114 data = json.loads(data)
3115 status_jobs = set()
3116 for p in data['pipelines']:
3117 for q in p['change_queues']:
3118 for head in q['heads']:
3119 for change in head:
James E. Blair63bb0ef2013-07-29 17:14:51 -07003120 for job in change['jobs']:
3121 status_jobs.add(job['name'])
James E. Blair21037782017-07-19 11:56:55 -07003122 self.assertIn('project-bitrot', status_jobs)
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003123
James E. Blair4f6033c2014-03-27 15:49:09 -07003124 def test_idle(self):
3125 "Test that frequent periodic jobs work"
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003126 # This test can not use simple_layout because it must start
3127 # with a configuration which does not include a
3128 # timer-triggered job so that we have an opportunity to set
3129 # the hold flag before the first job.
Paul Belanger174a8272017-03-14 13:20:10 -04003130 self.executor_server.hold_jobs_in_build = True
James E. Blair4f6033c2014-03-27 15:49:09 -07003131
Clark Boylan3ee090a2014-04-03 20:55:09 -07003132 for x in range(1, 3):
3133 # Test that timer triggers periodic jobs even across
3134 # layout config reloads.
3135 # Start timer trigger
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003136 self.commitConfigUpdate('common-config',
3137 'layouts/idle.yaml')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003138 self.sched.reconfigure(self.config)
James E. Blair995fc0f2016-02-04 16:48:31 -08003139 self.waitUntilSettled()
James E. Blair4f6033c2014-03-27 15:49:09 -07003140
Clark Boylan3ee090a2014-04-03 20:55:09 -07003141 # The pipeline triggers every second, so we should have seen
3142 # several by now.
3143 time.sleep(5)
Clark Boylan3ee090a2014-04-03 20:55:09 -07003144
3145 # Stop queuing timer triggered jobs so that the assertions
3146 # below don't race against more jobs being queued.
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003147 self.commitConfigUpdate('common-config',
3148 'layouts/no-timer.yaml')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003149 self.sched.reconfigure(self.config)
James E. Blair995fc0f2016-02-04 16:48:31 -08003150 self.waitUntilSettled()
James E. Blair78ae4782017-08-02 14:19:10 -07003151 # If APScheduler is in mid-event when we remove the job,
3152 # we can end up with one more event firing, so give it an
3153 # extra second to settle.
3154 time.sleep(1)
3155 self.waitUntilSettled()
James E. Blair21037782017-07-19 11:56:55 -07003156 self.assertEqual(len(self.builds), 1,
Clint Byrum58264dc2017-02-07 21:21:22 -08003157 'Timer builds iteration #%d' % x)
Paul Belanger174a8272017-03-14 13:20:10 -04003158 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003159 self.waitUntilSettled()
3160 self.assertEqual(len(self.builds), 0)
James E. Blair21037782017-07-19 11:56:55 -07003161 self.assertEqual(len(self.history), x)
James E. Blair4f6033c2014-03-27 15:49:09 -07003162
James E. Blaircc324192017-04-19 14:36:08 -07003163 @simple_layout('layouts/smtp.yaml')
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003164 def test_check_smtp_pool(self):
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003165 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3166 self.waitUntilSettled()
3167
3168 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3169 self.waitUntilSettled()
3170
James E. Blairff80a2f2013-12-27 13:24:06 -08003171 self.assertEqual(len(self.smtp_messages), 2)
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003172
3173 # A.messages only holds what FakeGerrit places in it. Thus we
3174 # work on the knowledge of what the first message should be as
3175 # it is only configured to go to SMTP.
3176
3177 self.assertEqual('zuul@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08003178 self.smtp_messages[0]['from_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003179 self.assertEqual(['you@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08003180 self.smtp_messages[0]['to_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003181 self.assertEqual('Starting check jobs.',
James E. Blairff80a2f2013-12-27 13:24:06 -08003182 self.smtp_messages[0]['body'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003183
3184 self.assertEqual('zuul_from@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08003185 self.smtp_messages[1]['from_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003186 self.assertEqual(['alternative_me@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08003187 self.smtp_messages[1]['to_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10003188 self.assertEqual(A.messages[0],
James E. Blairff80a2f2013-12-27 13:24:06 -08003189 self.smtp_messages[1]['body'])
James E. Blairad28e912013-11-27 10:43:22 -08003190
James E. Blaire5910202013-12-27 09:50:31 -08003191 def test_timer_smtp(self):
3192 "Test that a periodic job is triggered"
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003193 # This test can not use simple_layout because it must start
3194 # with a configuration which does not include a
3195 # timer-triggered job so that we have an opportunity to set
3196 # the hold flag before the first job.
Paul Belanger174a8272017-03-14 13:20:10 -04003197 self.executor_server.hold_jobs_in_build = True
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003198 self.commitConfigUpdate('common-config', 'layouts/timer-smtp.yaml')
James E. Blaire5910202013-12-27 09:50:31 -08003199 self.sched.reconfigure(self.config)
James E. Blaire5910202013-12-27 09:50:31 -08003200
Clark Boylan3ee090a2014-04-03 20:55:09 -07003201 # The pipeline triggers every second, so we should have seen
3202 # several by now.
3203 time.sleep(5)
James E. Blaire5910202013-12-27 09:50:31 -08003204 self.waitUntilSettled()
3205
Clark Boylan3ee090a2014-04-03 20:55:09 -07003206 self.assertEqual(len(self.builds), 2)
Paul Belanger174a8272017-03-14 13:20:10 -04003207 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003208 self.waitUntilSettled()
3209 self.assertEqual(len(self.history), 2)
3210
James E. Blaire5910202013-12-27 09:50:31 -08003211 self.assertEqual(self.getJobFromHistory(
3212 'project-bitrot-stable-old').result, 'SUCCESS')
3213 self.assertEqual(self.getJobFromHistory(
3214 'project-bitrot-stable-older').result, 'SUCCESS')
3215
James E. Blairff80a2f2013-12-27 13:24:06 -08003216 self.assertEqual(len(self.smtp_messages), 1)
James E. Blaire5910202013-12-27 09:50:31 -08003217
3218 # A.messages only holds what FakeGerrit places in it. Thus we
3219 # work on the knowledge of what the first message should be as
3220 # it is only configured to go to SMTP.
3221
3222 self.assertEqual('zuul_from@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08003223 self.smtp_messages[0]['from_email'])
James E. Blaire5910202013-12-27 09:50:31 -08003224 self.assertEqual(['alternative_me@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08003225 self.smtp_messages[0]['to_email'])
James E. Blaire5910202013-12-27 09:50:31 -08003226 self.assertIn('Subject: Periodic check for org/project succeeded',
James E. Blairff80a2f2013-12-27 13:24:06 -08003227 self.smtp_messages[0]['headers'])
James E. Blaire5910202013-12-27 09:50:31 -08003228
Clark Boylan3ee090a2014-04-03 20:55:09 -07003229 # Stop queuing timer triggered jobs and let any that may have
3230 # queued through so that end of test assertions pass.
James E. Blairdfdfcfc2017-04-20 10:19:20 -07003231 self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003232 self.sched.reconfigure(self.config)
James E. Blairf8058972014-08-15 16:09:16 -07003233 self.waitUntilSettled()
James E. Blair78ae4782017-08-02 14:19:10 -07003234 # If APScheduler is in mid-event when we remove the job, we
3235 # can end up with one more event firing, so give it an extra
3236 # second to settle.
3237 time.sleep(1)
3238 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003239 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07003240 self.waitUntilSettled()
3241
Joshua Hesketh25695cb2017-03-06 12:50:04 +11003242 @skip("Disabled for early v3 development")
Evgeny Antyshevda90a502017-02-08 08:42:59 +00003243 def test_timer_sshkey(self):
3244 "Test that a periodic job can setup SSH key authentication"
3245 self.worker.hold_jobs_in_build = True
3246 self.config.set('zuul', 'layout_config',
3247 'tests/fixtures/layout-timer.yaml')
3248 self.sched.reconfigure(self.config)
3249 self.registerJobs()
3250
3251 # The pipeline triggers every second, so we should have seen
3252 # several by now.
3253 time.sleep(5)
3254 self.waitUntilSettled()
3255
3256 self.assertEqual(len(self.builds), 2)
3257
3258 ssh_wrapper = os.path.join(self.git_root, ".ssh_wrapper_gerrit")
3259 self.assertTrue(os.path.isfile(ssh_wrapper))
3260 with open(ssh_wrapper) as f:
3261 ssh_wrapper_content = f.read()
3262 self.assertIn("fake_id_rsa", ssh_wrapper_content)
3263 # In the unit tests Merger runs in the same process,
3264 # so we see its' environment variables
3265 self.assertEqual(os.environ['GIT_SSH'], ssh_wrapper)
3266
3267 self.worker.release('.*')
3268 self.waitUntilSettled()
3269 self.assertEqual(len(self.history), 2)
3270
3271 self.assertEqual(self.getJobFromHistory(
3272 'project-bitrot-stable-old').result, 'SUCCESS')
3273 self.assertEqual(self.getJobFromHistory(
3274 'project-bitrot-stable-older').result, 'SUCCESS')
3275
3276 # Stop queuing timer triggered jobs and let any that may have
3277 # queued through so that end of test assertions pass.
3278 self.config.set('zuul', 'layout_config',
3279 'tests/fixtures/layout-no-timer.yaml')
3280 self.sched.reconfigure(self.config)
3281 self.registerJobs()
3282 self.waitUntilSettled()
James E. Blair78ae4782017-08-02 14:19:10 -07003283 # If APScheduler is in mid-event when we remove the job, we
3284 # can end up with one more event firing, so give it an extra
3285 # second to settle.
3286 time.sleep(1)
3287 self.waitUntilSettled()
Evgeny Antyshevda90a502017-02-08 08:42:59 +00003288 self.worker.release('.*')
3289 self.waitUntilSettled()
3290
James E. Blair91e34592015-07-31 16:45:59 -07003291 def test_client_enqueue_change(self):
James E. Blairad28e912013-11-27 10:43:22 -08003292 "Test that the RPC client can enqueue a change"
3293 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003294 A.addApproval('Code-Review', 2)
3295 A.addApproval('Approved', 1)
James E. Blairad28e912013-11-27 10:43:22 -08003296
3297 client = zuul.rpcclient.RPCClient('127.0.0.1',
3298 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003299 self.addCleanup(client.shutdown)
Paul Belangerbaca3132016-11-04 12:49:54 -04003300 r = client.enqueue(tenant='tenant-one',
3301 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003302 project='org/project',
3303 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003304 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003305 self.waitUntilSettled()
3306 self.assertEqual(self.getJobFromHistory('project-merge').result,
3307 'SUCCESS')
3308 self.assertEqual(self.getJobFromHistory('project-test1').result,
3309 'SUCCESS')
3310 self.assertEqual(self.getJobFromHistory('project-test2').result,
3311 'SUCCESS')
3312 self.assertEqual(A.data['status'], 'MERGED')
3313 self.assertEqual(A.reported, 2)
3314 self.assertEqual(r, True)
3315
James E. Blair91e34592015-07-31 16:45:59 -07003316 def test_client_enqueue_ref(self):
3317 "Test that the RPC client can enqueue a ref"
James E. Blair289f5932017-07-27 15:02:29 -07003318 p = "review.example.com/org/project"
3319 upstream = self.getUpstreamRepos([p])
3320 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3321 A.setMerged()
3322 A_commit = str(upstream[p].commit('master'))
3323 self.log.debug("A commit: %s" % A_commit)
James E. Blair91e34592015-07-31 16:45:59 -07003324
3325 client = zuul.rpcclient.RPCClient('127.0.0.1',
3326 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003327 self.addCleanup(client.shutdown)
James E. Blair91e34592015-07-31 16:45:59 -07003328 r = client.enqueue_ref(
Paul Belangerbaca3132016-11-04 12:49:54 -04003329 tenant='tenant-one',
James E. Blair91e34592015-07-31 16:45:59 -07003330 pipeline='post',
3331 project='org/project',
3332 trigger='gerrit',
3333 ref='master',
3334 oldrev='90f173846e3af9154517b88543ffbd1691f31366',
James E. Blair289f5932017-07-27 15:02:29 -07003335 newrev=A_commit)
James E. Blair91e34592015-07-31 16:45:59 -07003336 self.waitUntilSettled()
3337 job_names = [x.name for x in self.history]
3338 self.assertEqual(len(self.history), 1)
3339 self.assertIn('project-post', job_names)
3340 self.assertEqual(r, True)
3341
James E. Blairad28e912013-11-27 10:43:22 -08003342 def test_client_enqueue_negative(self):
3343 "Test that the RPC client returns errors"
3344 client = zuul.rpcclient.RPCClient('127.0.0.1',
3345 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003346 self.addCleanup(client.shutdown)
James E. Blairad28e912013-11-27 10:43:22 -08003347 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
Paul Belangerbaca3132016-11-04 12:49:54 -04003348 "Invalid tenant"):
3349 r = client.enqueue(tenant='tenant-foo',
3350 pipeline='gate',
3351 project='org/project',
3352 trigger='gerrit',
3353 change='1,1')
Paul Belangerbaca3132016-11-04 12:49:54 -04003354 self.assertEqual(r, False)
3355
3356 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
James E. Blairad28e912013-11-27 10:43:22 -08003357 "Invalid project"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003358 r = client.enqueue(tenant='tenant-one',
3359 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003360 project='project-does-not-exist',
3361 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003362 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003363 self.assertEqual(r, False)
3364
3365 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3366 "Invalid pipeline"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003367 r = client.enqueue(tenant='tenant-one',
3368 pipeline='pipeline-does-not-exist',
James E. Blairad28e912013-11-27 10:43:22 -08003369 project='org/project',
3370 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003371 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003372 self.assertEqual(r, False)
3373
3374 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3375 "Invalid trigger"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003376 r = client.enqueue(tenant='tenant-one',
3377 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003378 project='org/project',
3379 trigger='trigger-does-not-exist',
James E. Blair36658cf2013-12-06 17:53:48 -08003380 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003381 self.assertEqual(r, False)
3382
3383 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3384 "Invalid change"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003385 r = client.enqueue(tenant='tenant-one',
3386 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003387 project='org/project',
3388 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003389 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003390 self.assertEqual(r, False)
3391
3392 self.waitUntilSettled()
3393 self.assertEqual(len(self.history), 0)
3394 self.assertEqual(len(self.builds), 0)
James E. Blair36658cf2013-12-06 17:53:48 -08003395
3396 def test_client_promote(self):
3397 "Test that the RPC client can promote a change"
Paul Belanger174a8272017-03-14 13:20:10 -04003398 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003399 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3400 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3401 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003402 A.addApproval('Code-Review', 2)
3403 B.addApproval('Code-Review', 2)
3404 C.addApproval('Code-Review', 2)
James E. Blair36658cf2013-12-06 17:53:48 -08003405
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003406 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
3407 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
3408 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003409
3410 self.waitUntilSettled()
3411
Paul Belangerbaca3132016-11-04 12:49:54 -04003412 tenant = self.sched.abide.tenants.get('tenant-one')
3413 items = tenant.layout.pipelines['gate'].getAllItems()
Sean Daguef39b9ca2014-01-10 21:34:35 -05003414 enqueue_times = {}
3415 for item in items:
3416 enqueue_times[str(item.change)] = item.enqueue_time
3417
James E. Blair36658cf2013-12-06 17:53:48 -08003418 client = zuul.rpcclient.RPCClient('127.0.0.1',
3419 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003420 self.addCleanup(client.shutdown)
Paul Belangerbaca3132016-11-04 12:49:54 -04003421 r = client.promote(tenant='tenant-one',
3422 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003423 change_ids=['2,1', '3,1'])
3424
Sean Daguef39b9ca2014-01-10 21:34:35 -05003425 # ensure that enqueue times are durable
Paul Belangerbaca3132016-11-04 12:49:54 -04003426 items = tenant.layout.pipelines['gate'].getAllItems()
Sean Daguef39b9ca2014-01-10 21:34:35 -05003427 for item in items:
3428 self.assertEqual(
3429 enqueue_times[str(item.change)], item.enqueue_time)
3430
James E. Blair78acec92014-02-06 07:11:32 -08003431 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003432 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003433 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003434 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003435 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003436 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003437 self.waitUntilSettled()
3438
3439 self.assertEqual(len(self.builds), 6)
3440 self.assertEqual(self.builds[0].name, 'project-test1')
3441 self.assertEqual(self.builds[1].name, 'project-test2')
3442 self.assertEqual(self.builds[2].name, 'project-test1')
3443 self.assertEqual(self.builds[3].name, 'project-test2')
3444 self.assertEqual(self.builds[4].name, 'project-test1')
3445 self.assertEqual(self.builds[5].name, 'project-test2')
3446
Paul Belangerbaca3132016-11-04 12:49:54 -04003447 self.assertTrue(self.builds[0].hasChanges(B))
3448 self.assertFalse(self.builds[0].hasChanges(A))
3449 self.assertFalse(self.builds[0].hasChanges(C))
James E. Blair36658cf2013-12-06 17:53:48 -08003450
Paul Belangerbaca3132016-11-04 12:49:54 -04003451 self.assertTrue(self.builds[2].hasChanges(B))
3452 self.assertTrue(self.builds[2].hasChanges(C))
3453 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003454
Paul Belangerbaca3132016-11-04 12:49:54 -04003455 self.assertTrue(self.builds[4].hasChanges(B))
3456 self.assertTrue(self.builds[4].hasChanges(C))
3457 self.assertTrue(self.builds[4].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003458
Paul Belanger174a8272017-03-14 13:20:10 -04003459 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003460 self.waitUntilSettled()
3461
3462 self.assertEqual(A.data['status'], 'MERGED')
3463 self.assertEqual(A.reported, 2)
3464 self.assertEqual(B.data['status'], 'MERGED')
3465 self.assertEqual(B.reported, 2)
3466 self.assertEqual(C.data['status'], 'MERGED')
3467 self.assertEqual(C.reported, 2)
3468
James E. Blair36658cf2013-12-06 17:53:48 -08003469 self.assertEqual(r, True)
3470
3471 def test_client_promote_dependent(self):
3472 "Test that the RPC client can promote a dependent change"
3473 # C (depends on B) -> B -> A ; then promote C to get:
3474 # A -> C (depends on B) -> B
Paul Belanger174a8272017-03-14 13:20:10 -04003475 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003476 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3477 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3478 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3479
3480 C.setDependsOn(B, 1)
3481
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003482 A.addApproval('Code-Review', 2)
3483 B.addApproval('Code-Review', 2)
3484 C.addApproval('Code-Review', 2)
James E. Blair36658cf2013-12-06 17:53:48 -08003485
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003486 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
3487 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
3488 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003489
3490 self.waitUntilSettled()
3491
3492 client = zuul.rpcclient.RPCClient('127.0.0.1',
3493 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003494 self.addCleanup(client.shutdown)
Paul Belangerbaca3132016-11-04 12:49:54 -04003495 r = client.promote(tenant='tenant-one',
3496 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003497 change_ids=['3,1'])
3498
James E. Blair78acec92014-02-06 07:11:32 -08003499 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003500 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003501 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003502 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003503 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003504 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003505 self.waitUntilSettled()
3506
3507 self.assertEqual(len(self.builds), 6)
3508 self.assertEqual(self.builds[0].name, 'project-test1')
3509 self.assertEqual(self.builds[1].name, 'project-test2')
3510 self.assertEqual(self.builds[2].name, 'project-test1')
3511 self.assertEqual(self.builds[3].name, 'project-test2')
3512 self.assertEqual(self.builds[4].name, 'project-test1')
3513 self.assertEqual(self.builds[5].name, 'project-test2')
3514
Paul Belangerbaca3132016-11-04 12:49:54 -04003515 self.assertTrue(self.builds[0].hasChanges(B))
3516 self.assertFalse(self.builds[0].hasChanges(A))
3517 self.assertFalse(self.builds[0].hasChanges(C))
James E. Blair36658cf2013-12-06 17:53:48 -08003518
Paul Belangerbaca3132016-11-04 12:49:54 -04003519 self.assertTrue(self.builds[2].hasChanges(B))
3520 self.assertTrue(self.builds[2].hasChanges(C))
3521 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003522
Paul Belangerbaca3132016-11-04 12:49:54 -04003523 self.assertTrue(self.builds[4].hasChanges(B))
3524 self.assertTrue(self.builds[4].hasChanges(C))
3525 self.assertTrue(self.builds[4].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003526
Paul Belanger174a8272017-03-14 13:20:10 -04003527 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003528 self.waitUntilSettled()
3529
3530 self.assertEqual(A.data['status'], 'MERGED')
3531 self.assertEqual(A.reported, 2)
3532 self.assertEqual(B.data['status'], 'MERGED')
3533 self.assertEqual(B.reported, 2)
3534 self.assertEqual(C.data['status'], 'MERGED')
3535 self.assertEqual(C.reported, 2)
3536
James E. Blair36658cf2013-12-06 17:53:48 -08003537 self.assertEqual(r, True)
3538
3539 def test_client_promote_negative(self):
3540 "Test that the RPC client returns errors for promotion"
Paul Belanger174a8272017-03-14 13:20:10 -04003541 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003542 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003543 A.addApproval('Code-Review', 2)
3544 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003545 self.waitUntilSettled()
3546
3547 client = zuul.rpcclient.RPCClient('127.0.0.1',
3548 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003549 self.addCleanup(client.shutdown)
James E. Blair36658cf2013-12-06 17:53:48 -08003550
3551 with testtools.ExpectedException(zuul.rpcclient.RPCFailure):
Paul Belangerbaca3132016-11-04 12:49:54 -04003552 r = client.promote(tenant='tenant-one',
3553 pipeline='nonexistent',
James E. Blair36658cf2013-12-06 17:53:48 -08003554 change_ids=['2,1', '3,1'])
James E. Blair36658cf2013-12-06 17:53:48 -08003555 self.assertEqual(r, False)
3556
3557 with testtools.ExpectedException(zuul.rpcclient.RPCFailure):
Paul Belangerbaca3132016-11-04 12:49:54 -04003558 r = client.promote(tenant='tenant-one',
3559 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003560 change_ids=['4,1'])
James E. Blair36658cf2013-12-06 17:53:48 -08003561 self.assertEqual(r, False)
3562
Paul Belanger174a8272017-03-14 13:20:10 -04003563 self.executor_server.hold_jobs_in_build = False
3564 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003565 self.waitUntilSettled()
Clark Boylan7603a372014-01-21 11:43:20 -08003566
James E. Blaircc324192017-04-19 14:36:08 -07003567 @simple_layout('layouts/rate-limit.yaml')
Clark Boylan7603a372014-01-21 11:43:20 -08003568 def test_queue_rate_limiting(self):
3569 "Test that DependentPipelines are rate limited with dep across window"
Paul Belanger174a8272017-03-14 13:20:10 -04003570 self.executor_server.hold_jobs_in_build = True
Clark Boylan7603a372014-01-21 11:43:20 -08003571 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3572 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3573 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3574
3575 C.setDependsOn(B, 1)
Paul Belanger174a8272017-03-14 13:20:10 -04003576 self.executor_server.failJob('project-test1', A)
Clark Boylan7603a372014-01-21 11:43:20 -08003577
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003578 A.addApproval('Code-Review', 2)
3579 B.addApproval('Code-Review', 2)
3580 C.addApproval('Code-Review', 2)
Clark Boylan7603a372014-01-21 11:43:20 -08003581
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003582 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
3583 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
3584 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Clark Boylan7603a372014-01-21 11:43:20 -08003585 self.waitUntilSettled()
3586
3587 # Only A and B will have their merge jobs queued because
3588 # window is 2.
3589 self.assertEqual(len(self.builds), 2)
3590 self.assertEqual(self.builds[0].name, 'project-merge')
3591 self.assertEqual(self.builds[1].name, 'project-merge')
3592
James E. Blair732ee862017-04-21 07:49:26 -07003593 # Release the merge jobs one at a time.
3594 self.builds[0].release()
Clark Boylan7603a372014-01-21 11:43:20 -08003595 self.waitUntilSettled()
James E. Blair732ee862017-04-21 07:49:26 -07003596 self.builds[0].release()
Clark Boylan7603a372014-01-21 11:43:20 -08003597 self.waitUntilSettled()
3598
3599 # Only A and B will have their test jobs queued because
3600 # window is 2.
3601 self.assertEqual(len(self.builds), 4)
3602 self.assertEqual(self.builds[0].name, 'project-test1')
3603 self.assertEqual(self.builds[1].name, 'project-test2')
3604 self.assertEqual(self.builds[2].name, 'project-test1')
3605 self.assertEqual(self.builds[3].name, 'project-test2')
3606
Paul Belanger174a8272017-03-14 13:20:10 -04003607 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003608 self.waitUntilSettled()
3609
James E. Blaircc324192017-04-19 14:36:08 -07003610 tenant = self.sched.abide.tenants.get('tenant-one')
Clint Byrumb01f1ca2017-04-02 10:19:52 -07003611 queue = tenant.layout.pipelines['gate'].queues[0]
Clark Boylan7603a372014-01-21 11:43:20 -08003612 # A failed so window is reduced by 1 to 1.
3613 self.assertEqual(queue.window, 1)
3614 self.assertEqual(queue.window_floor, 1)
3615 self.assertEqual(A.data['status'], 'NEW')
3616
3617 # Gate is reset and only B's merge job is queued because
3618 # window shrunk to 1.
3619 self.assertEqual(len(self.builds), 1)
3620 self.assertEqual(self.builds[0].name, 'project-merge')
3621
Paul Belanger174a8272017-03-14 13:20:10 -04003622 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003623 self.waitUntilSettled()
3624
3625 # Only B's test jobs are queued because window is still 1.
3626 self.assertEqual(len(self.builds), 2)
3627 self.assertEqual(self.builds[0].name, 'project-test1')
3628 self.assertEqual(self.builds[1].name, 'project-test2')
3629
Paul Belanger174a8272017-03-14 13:20:10 -04003630 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003631 self.waitUntilSettled()
3632
3633 # B was successfully merged so window is increased to 2.
3634 self.assertEqual(queue.window, 2)
3635 self.assertEqual(queue.window_floor, 1)
3636 self.assertEqual(B.data['status'], 'MERGED')
3637
3638 # Only C is left and its merge job is queued.
3639 self.assertEqual(len(self.builds), 1)
3640 self.assertEqual(self.builds[0].name, 'project-merge')
3641
Paul Belanger174a8272017-03-14 13:20:10 -04003642 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003643 self.waitUntilSettled()
3644
3645 # After successful merge job the test jobs for C are queued.
3646 self.assertEqual(len(self.builds), 2)
3647 self.assertEqual(self.builds[0].name, 'project-test1')
3648 self.assertEqual(self.builds[1].name, 'project-test2')
3649
Paul Belanger174a8272017-03-14 13:20:10 -04003650 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003651 self.waitUntilSettled()
3652
3653 # C successfully merged so window is bumped to 3.
3654 self.assertEqual(queue.window, 3)
3655 self.assertEqual(queue.window_floor, 1)
3656 self.assertEqual(C.data['status'], 'MERGED')
3657
James E. Blaircc324192017-04-19 14:36:08 -07003658 @simple_layout('layouts/rate-limit.yaml')
Clark Boylan7603a372014-01-21 11:43:20 -08003659 def test_queue_rate_limiting_dependent(self):
3660 "Test that DependentPipelines are rate limited with dep in window"
Paul Belanger174a8272017-03-14 13:20:10 -04003661 self.executor_server.hold_jobs_in_build = True
Clark Boylan7603a372014-01-21 11:43:20 -08003662 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3663 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3664 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3665
3666 B.setDependsOn(A, 1)
3667
Paul Belanger174a8272017-03-14 13:20:10 -04003668 self.executor_server.failJob('project-test1', A)
Clark Boylan7603a372014-01-21 11:43:20 -08003669
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003670 A.addApproval('Code-Review', 2)
3671 B.addApproval('Code-Review', 2)
3672 C.addApproval('Code-Review', 2)
Clark Boylan7603a372014-01-21 11:43:20 -08003673
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003674 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
3675 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
3676 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Clark Boylan7603a372014-01-21 11:43:20 -08003677 self.waitUntilSettled()
3678
3679 # Only A and B will have their merge jobs queued because
3680 # window is 2.
3681 self.assertEqual(len(self.builds), 2)
3682 self.assertEqual(self.builds[0].name, 'project-merge')
3683 self.assertEqual(self.builds[1].name, 'project-merge')
3684
James E. Blairf4a5f022017-04-18 14:01:10 -07003685 self.orderedRelease(2)
Clark Boylan7603a372014-01-21 11:43:20 -08003686
3687 # Only A and B will have their test jobs queued because
3688 # window is 2.
3689 self.assertEqual(len(self.builds), 4)
3690 self.assertEqual(self.builds[0].name, 'project-test1')
3691 self.assertEqual(self.builds[1].name, 'project-test2')
3692 self.assertEqual(self.builds[2].name, 'project-test1')
3693 self.assertEqual(self.builds[3].name, 'project-test2')
3694
Paul Belanger174a8272017-03-14 13:20:10 -04003695 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003696 self.waitUntilSettled()
3697
James E. Blaircc324192017-04-19 14:36:08 -07003698 tenant = self.sched.abide.tenants.get('tenant-one')
Clint Byrum14ab6ca2017-04-03 10:15:10 -07003699 queue = tenant.layout.pipelines['gate'].queues[0]
Clark Boylan7603a372014-01-21 11:43:20 -08003700 # A failed so window is reduced by 1 to 1.
3701 self.assertEqual(queue.window, 1)
3702 self.assertEqual(queue.window_floor, 1)
3703 self.assertEqual(A.data['status'], 'NEW')
3704 self.assertEqual(B.data['status'], 'NEW')
3705
3706 # Gate is reset and only C's merge job is queued because
3707 # window shrunk to 1 and A and B were dequeued.
3708 self.assertEqual(len(self.builds), 1)
3709 self.assertEqual(self.builds[0].name, 'project-merge')
3710
James E. Blairf4a5f022017-04-18 14:01:10 -07003711 self.orderedRelease(1)
Clark Boylan7603a372014-01-21 11:43:20 -08003712
3713 # Only C's test jobs are queued because window is still 1.
3714 self.assertEqual(len(self.builds), 2)
James E. Blairdf25ddc2017-07-08 07:57:09 -07003715 builds = self.getSortedBuilds()
3716 self.assertEqual(builds[0].name, 'project-test1')
3717 self.assertEqual(builds[1].name, 'project-test2')
Clark Boylan7603a372014-01-21 11:43:20 -08003718
Paul Belanger174a8272017-03-14 13:20:10 -04003719 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003720 self.waitUntilSettled()
3721
3722 # C was successfully merged so window is increased to 2.
3723 self.assertEqual(queue.window, 2)
3724 self.assertEqual(queue.window_floor, 1)
3725 self.assertEqual(C.data['status'], 'MERGED')
Joshua Heskethba8776a2014-01-12 14:35:40 +08003726
3727 def test_worker_update_metadata(self):
3728 "Test if a worker can send back metadata about itself"
Paul Belanger174a8272017-03-14 13:20:10 -04003729 self.executor_server.hold_jobs_in_build = True
Joshua Heskethba8776a2014-01-12 14:35:40 +08003730
3731 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003732 A.addApproval('Code-Review', 2)
3733 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Joshua Heskethba8776a2014-01-12 14:35:40 +08003734 self.waitUntilSettled()
3735
Clint Byrumd4de79a2017-05-27 11:39:13 -07003736 self.assertEqual(len(self.executor_client.builds), 1)
Joshua Heskethba8776a2014-01-12 14:35:40 +08003737
3738 self.log.debug('Current builds:')
Clint Byrumd4de79a2017-05-27 11:39:13 -07003739 self.log.debug(self.executor_client.builds)
Joshua Heskethba8776a2014-01-12 14:35:40 +08003740
3741 start = time.time()
3742 while True:
3743 if time.time() - start > 10:
3744 raise Exception("Timeout waiting for gearman server to report "
3745 + "back to the client")
Clint Byrumd4de79a2017-05-27 11:39:13 -07003746 build = list(self.executor_client.builds.values())[0]
Monty Tayloreea6bb92017-06-14 11:56:54 -05003747 if build.worker.name == self.executor_server.hostname:
Joshua Heskethba8776a2014-01-12 14:35:40 +08003748 break
3749 else:
3750 time.sleep(0)
3751
3752 self.log.debug(build)
Monty Tayloreea6bb92017-06-14 11:56:54 -05003753 self.assertEqual(self.executor_server.hostname, build.worker.name)
Joshua Heskethba8776a2014-01-12 14:35:40 +08003754
Paul Belanger174a8272017-03-14 13:20:10 -04003755 self.executor_server.hold_jobs_in_build = False
3756 self.executor_server.release()
Joshua Heskethba8776a2014-01-12 14:35:40 +08003757 self.waitUntilSettled()
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003758
James E. Blaircc324192017-04-19 14:36:08 -07003759 @simple_layout('layouts/footer-message.yaml')
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003760 def test_footer_message(self):
3761 "Test a pipeline's footer message is correctly added to the report."
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003762 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003763 A.addApproval('Code-Review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04003764 self.executor_server.failJob('project-test1', A)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003765 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003766 self.waitUntilSettled()
3767
3768 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003769 B.addApproval('Code-Review', 2)
3770 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003771 self.waitUntilSettled()
3772
3773 self.assertEqual(2, len(self.smtp_messages))
3774
Adam Gandelman82258fd2017-02-07 16:51:58 -08003775 failure_msg = """\
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003776Build failed. For information on how to proceed, see \
Adam Gandelman82258fd2017-02-07 16:51:58 -08003777http://wiki.example.org/Test_Failures"""
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003778
Adam Gandelman82258fd2017-02-07 16:51:58 -08003779 footer_msg = """\
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003780For CI problems and help debugging, contact ci@example.org"""
3781
Adam Gandelman82258fd2017-02-07 16:51:58 -08003782 self.assertTrue(self.smtp_messages[0]['body'].startswith(failure_msg))
3783 self.assertTrue(self.smtp_messages[0]['body'].endswith(footer_msg))
3784 self.assertFalse(self.smtp_messages[1]['body'].startswith(failure_msg))
3785 self.assertTrue(self.smtp_messages[1]['body'].endswith(footer_msg))
Joshua Heskethb7179772014-01-30 23:30:46 +11003786
Tobias Henkel9842bd72017-05-16 13:40:03 +02003787 @simple_layout('layouts/unmanaged-project.yaml')
3788 def test_unmanaged_project_start_message(self):
3789 "Test start reporting is not done for unmanaged projects."
3790 self.init_repo("org/project", tag='init')
3791 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3792 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3793 self.waitUntilSettled()
3794
3795 self.assertEqual(0, len(A.messages))
3796
Clint Byrumb9de8be2017-05-27 13:49:19 -07003797 @simple_layout('layouts/merge-failure.yaml')
Joshua Heskethb7179772014-01-30 23:30:46 +11003798 def test_merge_failure_reporters(self):
3799 """Check that the config is set up correctly"""
3800
Clint Byrumb9de8be2017-05-27 13:49:19 -07003801 tenant = self.sched.abide.tenants.get('tenant-one')
Joshua Heskethb7179772014-01-30 23:30:46 +11003802 self.assertEqual(
Jeremy Stanley1c2c3c22015-06-15 21:23:19 +00003803 "Merge Failed.\n\nThis change or one of its cross-repo "
3804 "dependencies was unable to be automatically merged with the "
3805 "current state of its repository. Please rebase the change and "
3806 "upload a new patchset.",
Clint Byrumb9de8be2017-05-27 13:49:19 -07003807 tenant.layout.pipelines['check'].merge_failure_message)
Joshua Heskethb7179772014-01-30 23:30:46 +11003808 self.assertEqual(
3809 "The merge failed! For more information...",
Clint Byrumb9de8be2017-05-27 13:49:19 -07003810 tenant.layout.pipelines['gate'].merge_failure_message)
Joshua Heskethb7179772014-01-30 23:30:46 +11003811
3812 self.assertEqual(
Clint Byrumb9de8be2017-05-27 13:49:19 -07003813 len(tenant.layout.pipelines['check'].merge_failure_actions), 1)
Joshua Heskethb7179772014-01-30 23:30:46 +11003814 self.assertEqual(
Clint Byrumb9de8be2017-05-27 13:49:19 -07003815 len(tenant.layout.pipelines['gate'].merge_failure_actions), 2)
Joshua Heskethb7179772014-01-30 23:30:46 +11003816
3817 self.assertTrue(isinstance(
Clint Byrumb9de8be2017-05-27 13:49:19 -07003818 tenant.layout.pipelines['check'].merge_failure_actions[0],
3819 gerritreporter.GerritReporter))
Joshua Heskethb7179772014-01-30 23:30:46 +11003820
3821 self.assertTrue(
3822 (
Clint Byrumb9de8be2017-05-27 13:49:19 -07003823 isinstance(tenant.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003824 merge_failure_actions[0],
Clint Byrumb9de8be2017-05-27 13:49:19 -07003825 zuul.driver.smtp.smtpreporter.SMTPReporter) and
3826 isinstance(tenant.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003827 merge_failure_actions[1],
Clint Byrumb9de8be2017-05-27 13:49:19 -07003828 gerritreporter.GerritReporter)
Joshua Heskethb7179772014-01-30 23:30:46 +11003829 ) or (
Clint Byrumb9de8be2017-05-27 13:49:19 -07003830 isinstance(tenant.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003831 merge_failure_actions[0],
Clint Byrumb9de8be2017-05-27 13:49:19 -07003832 gerritreporter.GerritReporter) and
3833 isinstance(tenant.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003834 merge_failure_actions[1],
Clint Byrumb9de8be2017-05-27 13:49:19 -07003835 zuul.driver.smtp.smtpreporter.SMTPReporter)
Joshua Heskethb7179772014-01-30 23:30:46 +11003836 )
3837 )
3838
James E. Blairec056492016-07-22 09:45:56 -07003839 @skip("Disabled for early v3 development")
Joshua Heskethb7179772014-01-30 23:30:46 +11003840 def test_merge_failure_reports(self):
3841 """Check that when a change fails to merge the correct message is sent
3842 to the correct reporter"""
James E. Blairf84026c2015-12-08 16:11:46 -08003843 self.updateConfigLayout(
3844 'tests/fixtures/layout-merge-failure.yaml')
Joshua Heskethb7179772014-01-30 23:30:46 +11003845 self.sched.reconfigure(self.config)
3846 self.registerJobs()
3847
3848 # Check a test failure isn't reported to SMTP
3849 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003850 A.addApproval('Code-Review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04003851 self.executor_server.failJob('project-test1', A)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003852 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Joshua Heskethb7179772014-01-30 23:30:46 +11003853 self.waitUntilSettled()
3854
3855 self.assertEqual(3, len(self.history)) # 3 jobs
3856 self.assertEqual(0, len(self.smtp_messages))
3857
3858 # Check a merge failure is reported to SMTP
3859 # B should be merged, but C will conflict with B
3860 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3861 B.addPatchset(['conflict'])
3862 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3863 C.addPatchset(['conflict'])
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003864 B.addApproval('Code-Review', 2)
3865 C.addApproval('Code-Review', 2)
3866 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
3867 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Joshua Heskethb7179772014-01-30 23:30:46 +11003868 self.waitUntilSettled()
3869
3870 self.assertEqual(6, len(self.history)) # A and B jobs
3871 self.assertEqual(1, len(self.smtp_messages))
3872 self.assertEqual('The merge failed! For more information...',
3873 self.smtp_messages[0]['body'])
Joshua Hesketh36c3fa52014-01-22 11:40:52 +11003874
James E. Blairec056492016-07-22 09:45:56 -07003875 @skip("Disabled for early v3 development")
James E. Blairf760f0e2016-02-09 08:44:52 -08003876 def test_default_merge_failure_reports(self):
3877 """Check that the default merge failure reports are correct."""
3878
3879 # A should report success, B should report merge failure.
3880 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3881 A.addPatchset(['conflict'])
3882 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3883 B.addPatchset(['conflict'])
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003884 A.addApproval('Code-Review', 2)
3885 B.addApproval('Code-Review', 2)
3886 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
3887 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blairf760f0e2016-02-09 08:44:52 -08003888 self.waitUntilSettled()
3889
3890 self.assertEqual(3, len(self.history)) # A jobs
3891 self.assertEqual(A.reported, 2)
3892 self.assertEqual(B.reported, 2)
3893 self.assertEqual(A.data['status'], 'MERGED')
3894 self.assertEqual(B.data['status'], 'NEW')
3895 self.assertIn('Build succeeded', A.messages[1])
3896 self.assertIn('Merge Failed', B.messages[1])
3897 self.assertIn('automatically merged', B.messages[1])
3898 self.assertNotIn('logs.example.com', B.messages[1])
3899 self.assertNotIn('SKIPPED', B.messages[1])
3900
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003901 def test_client_get_running_jobs(self):
3902 "Test that the RPC client can get a list of running jobs"
Paul Belanger174a8272017-03-14 13:20:10 -04003903 self.executor_server.hold_jobs_in_build = True
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003904 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003905 A.addApproval('Code-Review', 2)
3906 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003907 self.waitUntilSettled()
3908
3909 client = zuul.rpcclient.RPCClient('127.0.0.1',
3910 self.gearman_server.port)
Clark Boylandf4eba22017-04-24 17:37:58 -07003911 self.addCleanup(client.shutdown)
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003912
3913 # Wait for gearman server to send the initial workData back to zuul
3914 start = time.time()
3915 while True:
3916 if time.time() - start > 10:
3917 raise Exception("Timeout waiting for gearman server to report "
3918 + "back to the client")
Clint Byrum1d0c7d12017-05-10 19:40:53 -07003919 build = list(self.executor_client.builds.values())[0]
Monty Tayloreea6bb92017-06-14 11:56:54 -05003920 if build.worker.name == self.executor_server.hostname:
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003921 break
3922 else:
3923 time.sleep(0)
3924
3925 running_items = client.get_running_jobs()
3926
3927 self.assertEqual(1, len(running_items))
3928 running_item = running_items[0]
3929 self.assertEqual([], running_item['failing_reasons'])
3930 self.assertEqual([], running_item['items_behind'])
3931 self.assertEqual('https://hostname/1', running_item['url'])
Monty Taylor38b553a2017-06-05 13:06:10 -05003932 self.assertIsNone(running_item['item_ahead'])
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003933 self.assertEqual('org/project', running_item['project'])
Monty Taylor38b553a2017-06-05 13:06:10 -05003934 self.assertIsNone(running_item['remaining_time'])
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003935 self.assertEqual(True, running_item['active'])
3936 self.assertEqual('1,1', running_item['id'])
3937
3938 self.assertEqual(3, len(running_item['jobs']))
3939 for job in running_item['jobs']:
3940 if job['name'] == 'project-merge':
3941 self.assertEqual('project-merge', job['name'])
3942 self.assertEqual('gate', job['pipeline'])
3943 self.assertEqual(False, job['retry'])
Monty Taylor51139a02016-05-24 11:28:10 -05003944 self.assertEqual(
Tobias Henkelb4407fc2017-07-07 13:52:56 +02003945 'static/stream.html?uuid={uuid}&logfile=console.log'
3946 .format(uuid=job['uuid']), job['url'])
3947 self.assertEqual(
Monty Taylor51139a02016-05-24 11:28:10 -05003948 'finger://{hostname}/{uuid}'.format(
3949 hostname=self.executor_server.hostname,
3950 uuid=job['uuid']),
Tobias Henkelb4407fc2017-07-07 13:52:56 +02003951 job['finger_url'])
Clint Byrumd4de79a2017-05-27 11:39:13 -07003952 self.assertEqual(2, len(job['worker']))
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003953 self.assertEqual(False, job['canceled'])
3954 self.assertEqual(True, job['voting'])
Monty Taylor38b553a2017-06-05 13:06:10 -05003955 self.assertIsNone(job['result'])
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003956 self.assertEqual('gate', job['pipeline'])
3957 break
3958
Paul Belanger174a8272017-03-14 13:20:10 -04003959 self.executor_server.hold_jobs_in_build = False
3960 self.executor_server.release()
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003961 self.waitUntilSettled()
3962
3963 running_items = client.get_running_jobs()
3964 self.assertEqual(0, len(running_items))
James E. Blairbadc1ad2014-04-28 13:55:14 -07003965
James E. Blairb70e55a2017-04-19 12:57:02 -07003966 @simple_layout('layouts/nonvoting-pipeline.yaml')
James E. Blairbadc1ad2014-04-28 13:55:14 -07003967 def test_nonvoting_pipeline(self):
3968 "Test that a nonvoting pipeline (experimental) can still report"
3969
Joshua Heskethcc017ea2014-04-30 19:55:25 +10003970 A = self.fake_gerrit.addFakeChange('org/experimental-project',
3971 'master', 'A')
James E. Blairbadc1ad2014-04-28 13:55:14 -07003972 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3973 self.waitUntilSettled()
Paul Belanger15e3e202016-10-14 16:27:34 -04003974
3975 self.assertEqual(self.getJobFromHistory('project-merge').result,
3976 'SUCCESS')
Joshua Heskethcc017ea2014-04-30 19:55:25 +10003977 self.assertEqual(
3978 self.getJobFromHistory('experimental-project-test').result,
3979 'SUCCESS')
James E. Blairbadc1ad2014-04-28 13:55:14 -07003980 self.assertEqual(A.reported, 1)
James E. Blair5ee24252014-12-30 10:12:29 -08003981
3982 def test_crd_gate(self):
3983 "Test cross-repo dependencies"
3984 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3985 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02003986 A.addApproval('Code-Review', 2)
3987 B.addApproval('Code-Review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08003988
3989 AM2 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM2')
3990 AM1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM1')
3991 AM2.setMerged()
3992 AM1.setMerged()
3993
3994 BM2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM2')
3995 BM1 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM1')
3996 BM2.setMerged()
3997 BM1.setMerged()
3998
3999 # A -> AM1 -> AM2
4000 # B -> BM1 -> BM2
4001 # A Depends-On: B
4002 # M2 is here to make sure it is never queried. If it is, it
4003 # means zuul is walking down the entire history of merged
4004 # changes.
4005
4006 B.setDependsOn(BM1, 1)
4007 BM1.setDependsOn(BM2, 1)
4008
4009 A.setDependsOn(AM1, 1)
4010 AM1.setDependsOn(AM2, 1)
4011
4012 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4013 A.subject, B.data['id'])
4014
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004015 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004016 self.waitUntilSettled()
4017
4018 self.assertEqual(A.data['status'], 'NEW')
4019 self.assertEqual(B.data['status'], 'NEW')
4020
Paul Belanger5dccbe72016-11-14 11:17:37 -05004021 for connection in self.connections.connections.values():
James E. Blairb0a95ab2017-10-18 09:39:18 -07004022 connection.maintainCache([])
James E. Blair5ee24252014-12-30 10:12:29 -08004023
Paul Belanger174a8272017-03-14 13:20:10 -04004024 self.executor_server.hold_jobs_in_build = True
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004025 B.addApproval('Approved', 1)
4026 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004027 self.waitUntilSettled()
4028
Paul Belanger174a8272017-03-14 13:20:10 -04004029 self.executor_server.release('.*-merge')
James E. Blair5ee24252014-12-30 10:12:29 -08004030 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004031 self.executor_server.release('.*-merge')
James E. Blair5ee24252014-12-30 10:12:29 -08004032 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004033 self.executor_server.hold_jobs_in_build = False
4034 self.executor_server.release()
James E. Blair5ee24252014-12-30 10:12:29 -08004035 self.waitUntilSettled()
4036
4037 self.assertEqual(AM2.queried, 0)
4038 self.assertEqual(BM2.queried, 0)
4039 self.assertEqual(A.data['status'], 'MERGED')
4040 self.assertEqual(B.data['status'], 'MERGED')
4041 self.assertEqual(A.reported, 2)
4042 self.assertEqual(B.reported, 2)
4043
Paul Belanger5dccbe72016-11-14 11:17:37 -05004044 changes = self.getJobFromHistory(
4045 'project-merge', 'org/project1').changes
4046 self.assertEqual(changes, '2,1 1,1')
James E. Blair8f78d882015-02-05 08:51:37 -08004047
4048 def test_crd_branch(self):
4049 "Test cross-repo dependencies in multiple branches"
Paul Belanger6379db12016-11-14 13:57:54 -05004050
4051 self.create_branch('org/project2', 'mp')
James E. Blair8f78d882015-02-05 08:51:37 -08004052 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4053 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004054 C1 = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C1')
4055 C2 = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C2',
4056 status='ABANDONED')
4057 C1.data['id'] = B.data['id']
4058 C2.data['id'] = B.data['id']
4059
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004060 A.addApproval('Code-Review', 2)
4061 B.addApproval('Code-Review', 2)
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004062 C1.addApproval('Code-Review', 2)
James E. Blair8f78d882015-02-05 08:51:37 -08004063
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004064 # A Depends-On: B+C1
James E. Blair8f78d882015-02-05 08:51:37 -08004065 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4066 A.subject, B.data['id'])
4067
Paul Belanger174a8272017-03-14 13:20:10 -04004068 self.executor_server.hold_jobs_in_build = True
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004069 B.addApproval('Approved', 1)
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004070 C1.addApproval('Approved', 1)
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004071 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair8f78d882015-02-05 08:51:37 -08004072 self.waitUntilSettled()
4073
Paul Belanger174a8272017-03-14 13:20:10 -04004074 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004075 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004076 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004077 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004078 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004079 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004080 self.executor_server.hold_jobs_in_build = False
4081 self.executor_server.release()
James E. Blair8f78d882015-02-05 08:51:37 -08004082 self.waitUntilSettled()
4083
4084 self.assertEqual(A.data['status'], 'MERGED')
4085 self.assertEqual(B.data['status'], 'MERGED')
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004086 self.assertEqual(C1.data['status'], 'MERGED')
James E. Blair8f78d882015-02-05 08:51:37 -08004087 self.assertEqual(A.reported, 2)
4088 self.assertEqual(B.reported, 2)
K Jonathan Harkerd1d51d22017-08-23 11:57:40 -04004089 self.assertEqual(C1.reported, 2)
James E. Blair8f78d882015-02-05 08:51:37 -08004090
Paul Belanger6379db12016-11-14 13:57:54 -05004091 changes = self.getJobFromHistory(
4092 'project-merge', 'org/project1').changes
4093 self.assertEqual(changes, '2,1 3,1 1,1')
James E. Blair8f78d882015-02-05 08:51:37 -08004094
4095 def test_crd_multiline(self):
4096 "Test multiple depends-on lines in commit"
4097 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4098 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4099 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004100 A.addApproval('Code-Review', 2)
4101 B.addApproval('Code-Review', 2)
4102 C.addApproval('Code-Review', 2)
James E. Blair8f78d882015-02-05 08:51:37 -08004103
4104 # A Depends-On: B+C
4105 A.data['commitMessage'] = '%s\n\nDepends-On: %s\nDepends-On: %s\n' % (
4106 A.subject, B.data['id'], C.data['id'])
4107
Paul Belanger174a8272017-03-14 13:20:10 -04004108 self.executor_server.hold_jobs_in_build = True
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004109 B.addApproval('Approved', 1)
4110 C.addApproval('Approved', 1)
4111 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair8f78d882015-02-05 08:51:37 -08004112 self.waitUntilSettled()
4113
Paul Belanger174a8272017-03-14 13:20:10 -04004114 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004115 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004116 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004117 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004118 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08004119 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004120 self.executor_server.hold_jobs_in_build = False
4121 self.executor_server.release()
James E. Blair8f78d882015-02-05 08:51:37 -08004122 self.waitUntilSettled()
4123
4124 self.assertEqual(A.data['status'], 'MERGED')
4125 self.assertEqual(B.data['status'], 'MERGED')
4126 self.assertEqual(C.data['status'], 'MERGED')
4127 self.assertEqual(A.reported, 2)
4128 self.assertEqual(B.reported, 2)
4129 self.assertEqual(C.reported, 2)
4130
Paul Belanger5dccbe72016-11-14 11:17:37 -05004131 changes = self.getJobFromHistory(
4132 'project-merge', 'org/project1').changes
4133 self.assertEqual(changes, '2,1 3,1 1,1')
James E. Blair5ee24252014-12-30 10:12:29 -08004134
4135 def test_crd_unshared_gate(self):
4136 "Test cross-repo dependencies in unshared gate queues"
4137 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4138 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004139 A.addApproval('Code-Review', 2)
4140 B.addApproval('Code-Review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08004141
4142 # A Depends-On: B
4143 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4144 A.subject, B.data['id'])
4145
4146 # A and B do not share a queue, make sure that A is unable to
4147 # enqueue B (and therefore, A is unable to be enqueued).
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004148 B.addApproval('Approved', 1)
4149 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004150 self.waitUntilSettled()
4151
4152 self.assertEqual(A.data['status'], 'NEW')
4153 self.assertEqual(B.data['status'], 'NEW')
4154 self.assertEqual(A.reported, 0)
4155 self.assertEqual(B.reported, 0)
4156 self.assertEqual(len(self.history), 0)
4157
4158 # Enqueue and merge B alone.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004159 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004160 self.waitUntilSettled()
4161
4162 self.assertEqual(B.data['status'], 'MERGED')
4163 self.assertEqual(B.reported, 2)
4164
4165 # Now that B is merged, A should be able to be enqueued and
4166 # merged.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004167 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004168 self.waitUntilSettled()
4169
4170 self.assertEqual(A.data['status'], 'MERGED')
4171 self.assertEqual(A.reported, 2)
4172
James E. Blair96698e22015-04-02 07:48:21 -07004173 def test_crd_gate_reverse(self):
4174 "Test reverse cross-repo dependencies"
4175 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4176 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004177 A.addApproval('Code-Review', 2)
4178 B.addApproval('Code-Review', 2)
James E. Blair96698e22015-04-02 07:48:21 -07004179
4180 # A Depends-On: B
4181
4182 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4183 A.subject, B.data['id'])
4184
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004185 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair96698e22015-04-02 07:48:21 -07004186 self.waitUntilSettled()
4187
4188 self.assertEqual(A.data['status'], 'NEW')
4189 self.assertEqual(B.data['status'], 'NEW')
4190
Paul Belanger174a8272017-03-14 13:20:10 -04004191 self.executor_server.hold_jobs_in_build = True
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004192 A.addApproval('Approved', 1)
4193 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blair96698e22015-04-02 07:48:21 -07004194 self.waitUntilSettled()
4195
Paul Belanger174a8272017-03-14 13:20:10 -04004196 self.executor_server.release('.*-merge')
James E. Blair96698e22015-04-02 07:48:21 -07004197 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004198 self.executor_server.release('.*-merge')
James E. Blair96698e22015-04-02 07:48:21 -07004199 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004200 self.executor_server.hold_jobs_in_build = False
4201 self.executor_server.release()
James E. Blair96698e22015-04-02 07:48:21 -07004202 self.waitUntilSettled()
4203
4204 self.assertEqual(A.data['status'], 'MERGED')
4205 self.assertEqual(B.data['status'], 'MERGED')
4206 self.assertEqual(A.reported, 2)
4207 self.assertEqual(B.reported, 2)
4208
Paul Belanger5dccbe72016-11-14 11:17:37 -05004209 changes = self.getJobFromHistory(
4210 'project-merge', 'org/project1').changes
4211 self.assertEqual(changes, '2,1 1,1')
James E. Blair96698e22015-04-02 07:48:21 -07004212
James E. Blair5ee24252014-12-30 10:12:29 -08004213 def test_crd_cycle(self):
4214 "Test cross-repo dependency cycles"
4215 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4216 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004217 A.addApproval('Code-Review', 2)
4218 B.addApproval('Code-Review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08004219
4220 # A -> B -> A (via commit-depends)
4221
4222 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4223 A.subject, B.data['id'])
4224 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4225 B.subject, A.data['id'])
4226
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004227 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08004228 self.waitUntilSettled()
4229
4230 self.assertEqual(A.reported, 0)
4231 self.assertEqual(B.reported, 0)
4232 self.assertEqual(A.data['status'], 'NEW')
4233 self.assertEqual(B.data['status'], 'NEW')
James E. Blairbfb8e042014-12-30 17:01:44 -08004234
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004235 def test_crd_gate_unknown(self):
4236 "Test unknown projects in dependent pipeline"
James E. Blairc4ba97a2017-04-19 16:26:24 -07004237 self.init_repo("org/unknown", tag='init')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004238 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4239 B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004240 A.addApproval('Code-Review', 2)
4241 B.addApproval('Code-Review', 2)
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004242
4243 # A Depends-On: B
4244 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4245 A.subject, B.data['id'])
4246
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004247 B.addApproval('Approved', 1)
4248 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004249 self.waitUntilSettled()
4250
4251 # Unknown projects cannot share a queue with any other
4252 # since they don't have common jobs with any other (they have no jobs).
4253 # Changes which depend on unknown project changes
4254 # should not be processed in dependent pipeline
4255 self.assertEqual(A.data['status'], 'NEW')
4256 self.assertEqual(B.data['status'], 'NEW')
4257 self.assertEqual(A.reported, 0)
4258 self.assertEqual(B.reported, 0)
4259 self.assertEqual(len(self.history), 0)
4260
James E. Blair7720b402017-06-07 08:51:49 -07004261 # Simulate change B being gated outside this layout Set the
4262 # change merged before submitting the event so that when the
4263 # event triggers a gerrit query to update the change, we get
4264 # the information that it was merged.
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004265 B.setMerged()
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004266 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004267 self.waitUntilSettled()
4268 self.assertEqual(len(self.history), 0)
4269
4270 # Now that B is merged, A should be able to be enqueued and
4271 # merged.
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004272 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004273 self.waitUntilSettled()
4274
4275 self.assertEqual(A.data['status'], 'MERGED')
4276 self.assertEqual(A.reported, 2)
4277 self.assertEqual(B.data['status'], 'MERGED')
4278 self.assertEqual(B.reported, 0)
4279
James E. Blairbfb8e042014-12-30 17:01:44 -08004280 def test_crd_check(self):
4281 "Test cross-repo dependencies in independent pipelines"
4282
Paul Belanger174a8272017-03-14 13:20:10 -04004283 self.executor_server.hold_jobs_in_build = True
James E. Blairbfb8e042014-12-30 17:01:44 -08004284 self.gearman_server.hold_jobs_in_queue = True
4285 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4286 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4287
4288 # A Depends-On: B
4289 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4290 A.subject, B.data['id'])
4291
4292 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4293 self.waitUntilSettled()
4294
James E. Blairbfb8e042014-12-30 17:01:44 -08004295 self.gearman_server.hold_jobs_in_queue = False
4296 self.gearman_server.release()
4297 self.waitUntilSettled()
4298
Paul Belanger174a8272017-03-14 13:20:10 -04004299 self.executor_server.release('.*-merge')
Paul Belangerb30342b2016-11-14 12:30:43 -05004300 self.waitUntilSettled()
4301
James E. Blair2a535672017-04-27 12:03:15 -07004302 self.assertTrue(self.builds[0].hasChanges(A, B))
James E. Blairbfb8e042014-12-30 17:01:44 -08004303
Paul Belanger174a8272017-03-14 13:20:10 -04004304 self.executor_server.hold_jobs_in_build = False
4305 self.executor_server.release()
Paul Belangerb30342b2016-11-14 12:30:43 -05004306 self.waitUntilSettled()
4307
James E. Blairbfb8e042014-12-30 17:01:44 -08004308 self.assertEqual(A.data['status'], 'NEW')
4309 self.assertEqual(B.data['status'], 'NEW')
4310 self.assertEqual(A.reported, 1)
4311 self.assertEqual(B.reported, 0)
4312
4313 self.assertEqual(self.history[0].changes, '2,1 1,1')
Paul Belangerb30342b2016-11-14 12:30:43 -05004314 tenant = self.sched.abide.tenants.get('tenant-one')
4315 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blair8f78d882015-02-05 08:51:37 -08004316
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004317 def test_crd_check_git_depends(self):
4318 "Test single-repo dependencies in independent pipelines"
James E. Blairb8c16472015-05-05 14:55:26 -07004319 self.gearman_server.hold_jobs_in_build = True
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004320 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4321 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
4322
4323 # Add two git-dependent changes and make sure they both report
4324 # success.
4325 B.setDependsOn(A, 1)
4326 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4327 self.waitUntilSettled()
4328 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4329 self.waitUntilSettled()
4330
James E. Blairb8c16472015-05-05 14:55:26 -07004331 self.orderedRelease()
4332 self.gearman_server.hold_jobs_in_build = False
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004333 self.waitUntilSettled()
4334
4335 self.assertEqual(A.data['status'], 'NEW')
4336 self.assertEqual(B.data['status'], 'NEW')
4337 self.assertEqual(A.reported, 1)
4338 self.assertEqual(B.reported, 1)
4339
4340 self.assertEqual(self.history[0].changes, '1,1')
4341 self.assertEqual(self.history[-1].changes, '1,1 2,1')
Paul Belanger08136962016-11-03 17:57:38 -04004342 tenant = self.sched.abide.tenants.get('tenant-one')
4343 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004344
4345 self.assertIn('Build succeeded', A.messages[0])
4346 self.assertIn('Build succeeded', B.messages[0])
4347
4348 def test_crd_check_duplicate(self):
4349 "Test duplicate check in independent pipelines"
Paul Belanger174a8272017-03-14 13:20:10 -04004350 self.executor_server.hold_jobs_in_build = True
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004351 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4352 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
Paul Belanger08136962016-11-03 17:57:38 -04004353 tenant = self.sched.abide.tenants.get('tenant-one')
4354 check_pipeline = tenant.layout.pipelines['check']
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004355
4356 # Add two git-dependent changes...
4357 B.setDependsOn(A, 1)
4358 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4359 self.waitUntilSettled()
4360 self.assertEqual(len(check_pipeline.getAllItems()), 2)
4361
4362 # ...make sure the live one is not duplicated...
4363 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4364 self.waitUntilSettled()
4365 self.assertEqual(len(check_pipeline.getAllItems()), 2)
4366
4367 # ...but the non-live one is able to be.
4368 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4369 self.waitUntilSettled()
4370 self.assertEqual(len(check_pipeline.getAllItems()), 3)
4371
Clark Boylandd849822015-03-02 12:38:14 -08004372 # Release jobs in order to avoid races with change A jobs
4373 # finishing before change B jobs.
James E. Blaird7650852015-05-07 15:47:37 -07004374 self.orderedRelease()
Paul Belanger174a8272017-03-14 13:20:10 -04004375 self.executor_server.hold_jobs_in_build = False
4376 self.executor_server.release()
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004377 self.waitUntilSettled()
4378
4379 self.assertEqual(A.data['status'], 'NEW')
4380 self.assertEqual(B.data['status'], 'NEW')
4381 self.assertEqual(A.reported, 1)
4382 self.assertEqual(B.reported, 1)
4383
4384 self.assertEqual(self.history[0].changes, '1,1 2,1')
4385 self.assertEqual(self.history[1].changes, '1,1')
Paul Belanger08136962016-11-03 17:57:38 -04004386 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004387
4388 self.assertIn('Build succeeded', A.messages[0])
4389 self.assertIn('Build succeeded', B.messages[0])
4390
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004391 def _test_crd_check_reconfiguration(self, project1, project2):
James E. Blair8f78d882015-02-05 08:51:37 -08004392 "Test cross-repo dependencies re-enqueued in independent pipelines"
4393
4394 self.gearman_server.hold_jobs_in_queue = True
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004395 A = self.fake_gerrit.addFakeChange(project1, 'master', 'A')
4396 B = self.fake_gerrit.addFakeChange(project2, 'master', 'B')
James E. Blair8f78d882015-02-05 08:51:37 -08004397
4398 # A Depends-On: B
4399 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4400 A.subject, B.data['id'])
4401
4402 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4403 self.waitUntilSettled()
4404
4405 self.sched.reconfigure(self.config)
4406
4407 # Make sure the items still share a change queue, and the
4408 # first one is not live.
Paul Belangerce4485f2016-11-11 17:01:56 -05004409 tenant = self.sched.abide.tenants.get('tenant-one')
4410 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 1)
4411 queue = tenant.layout.pipelines['check'].queues[0]
James E. Blair8f78d882015-02-05 08:51:37 -08004412 first_item = queue.queue[0]
4413 for item in queue.queue:
4414 self.assertEqual(item.queue, first_item.queue)
4415 self.assertFalse(first_item.live)
4416 self.assertTrue(queue.queue[1].live)
4417
4418 self.gearman_server.hold_jobs_in_queue = False
4419 self.gearman_server.release()
4420 self.waitUntilSettled()
4421
4422 self.assertEqual(A.data['status'], 'NEW')
4423 self.assertEqual(B.data['status'], 'NEW')
4424 self.assertEqual(A.reported, 1)
4425 self.assertEqual(B.reported, 0)
4426
4427 self.assertEqual(self.history[0].changes, '2,1 1,1')
Paul Belangerce4485f2016-11-11 17:01:56 -05004428 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blair17dd6772015-02-09 14:45:18 -08004429
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004430 def test_crd_check_reconfiguration(self):
4431 self._test_crd_check_reconfiguration('org/project1', 'org/project2')
4432
4433 def test_crd_undefined_project(self):
4434 """Test that undefined projects in dependencies are handled for
4435 independent pipelines"""
4436 # It's a hack for fake gerrit,
4437 # as it implies repo creation upon the creation of any change
James E. Blairc4ba97a2017-04-19 16:26:24 -07004438 self.init_repo("org/unknown", tag='init')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004439 self._test_crd_check_reconfiguration('org/project1', 'org/unknown')
4440
Jesse Keatingea68ab42017-04-19 15:03:30 -07004441 @simple_layout('layouts/ignore-dependencies.yaml')
James E. Blair17dd6772015-02-09 14:45:18 -08004442 def test_crd_check_ignore_dependencies(self):
4443 "Test cross-repo dependencies can be ignored"
James E. Blair17dd6772015-02-09 14:45:18 -08004444
4445 self.gearman_server.hold_jobs_in_queue = True
4446 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4447 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4448 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
4449
4450 # A Depends-On: B
4451 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4452 A.subject, B.data['id'])
4453 # C git-depends on B
4454 C.setDependsOn(B, 1)
4455 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4456 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4457 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4458 self.waitUntilSettled()
4459
4460 # Make sure none of the items share a change queue, and all
4461 # are live.
Jesse Keatingea68ab42017-04-19 15:03:30 -07004462 tenant = self.sched.abide.tenants.get('tenant-one')
Clint Byrum12282ca2017-04-03 11:04:02 -07004463 check_pipeline = tenant.layout.pipelines['check']
James E. Blair17dd6772015-02-09 14:45:18 -08004464 self.assertEqual(len(check_pipeline.queues), 3)
4465 self.assertEqual(len(check_pipeline.getAllItems()), 3)
4466 for item in check_pipeline.getAllItems():
4467 self.assertTrue(item.live)
4468
4469 self.gearman_server.hold_jobs_in_queue = False
4470 self.gearman_server.release()
4471 self.waitUntilSettled()
4472
4473 self.assertEqual(A.data['status'], 'NEW')
4474 self.assertEqual(B.data['status'], 'NEW')
4475 self.assertEqual(C.data['status'], 'NEW')
4476 self.assertEqual(A.reported, 1)
4477 self.assertEqual(B.reported, 1)
4478 self.assertEqual(C.reported, 1)
4479
4480 # Each job should have tested exactly one change
4481 for job in self.history:
4482 self.assertEqual(len(job.changes.split()), 1)
James E. Blair96698e22015-04-02 07:48:21 -07004483
James E. Blair7cb84542017-04-19 13:35:05 -07004484 @simple_layout('layouts/three-projects.yaml')
James E. Blair96698e22015-04-02 07:48:21 -07004485 def test_crd_check_transitive(self):
4486 "Test transitive cross-repo dependencies"
4487 # Specifically, if A -> B -> C, and C gets a new patchset and
4488 # A gets a new patchset, ensure the test of A,2 includes B,1
4489 # and C,2 (not C,1 which would indicate stale data in the
4490 # cache for B).
4491 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4492 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4493 C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C')
4494
4495 # A Depends-On: B
4496 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4497 A.subject, B.data['id'])
4498
4499 # B Depends-On: C
4500 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4501 B.subject, C.data['id'])
4502
4503 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4504 self.waitUntilSettled()
4505 self.assertEqual(self.history[-1].changes, '3,1 2,1 1,1')
4506
4507 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4508 self.waitUntilSettled()
4509 self.assertEqual(self.history[-1].changes, '3,1 2,1')
4510
4511 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4512 self.waitUntilSettled()
4513 self.assertEqual(self.history[-1].changes, '3,1')
4514
4515 C.addPatchset()
4516 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(2))
4517 self.waitUntilSettled()
4518 self.assertEqual(self.history[-1].changes, '3,2')
4519
4520 A.addPatchset()
4521 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
4522 self.waitUntilSettled()
4523 self.assertEqual(self.history[-1].changes, '3,2 2,1 1,2')
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004524
James E. Blaira8b90b32016-08-24 15:18:50 -07004525 def test_crd_check_unknown(self):
4526 "Test unknown projects in independent pipeline"
James E. Blairc4ba97a2017-04-19 16:26:24 -07004527 self.init_repo("org/unknown", tag='init')
James E. Blaira8b90b32016-08-24 15:18:50 -07004528 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4529 B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D')
4530 # A Depends-On: B
4531 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4532 A.subject, B.data['id'])
4533
4534 # Make sure zuul has seen an event on B.
4535 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4536 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4537 self.waitUntilSettled()
4538
4539 self.assertEqual(A.data['status'], 'NEW')
4540 self.assertEqual(A.reported, 1)
4541 self.assertEqual(B.data['status'], 'NEW')
4542 self.assertEqual(B.reported, 0)
4543
James E. Blair92464a22016-04-05 10:21:26 -07004544 def test_crd_cycle_join(self):
4545 "Test an updated change creates a cycle"
4546 A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A')
4547
4548 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4549 self.waitUntilSettled()
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004550 self.assertEqual(A.reported, 1)
James E. Blair92464a22016-04-05 10:21:26 -07004551
4552 # Create B->A
4553 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
4554 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4555 B.subject, A.data['id'])
4556 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4557 self.waitUntilSettled()
4558
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004559 # Dep is there so zuul should have reported on B
4560 self.assertEqual(B.reported, 1)
4561
James E. Blair92464a22016-04-05 10:21:26 -07004562 # Update A to add A->B (a cycle).
4563 A.addPatchset()
4564 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4565 A.subject, B.data['id'])
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004566 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
4567 self.waitUntilSettled()
James E. Blair92464a22016-04-05 10:21:26 -07004568
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004569 # Dependency cycle injected so zuul should not have reported again on A
4570 self.assertEqual(A.reported, 1)
James E. Blair92464a22016-04-05 10:21:26 -07004571
4572 # Now if we update B to remove the depends-on, everything
4573 # should be okay. B; A->B
4574
4575 B.addPatchset()
4576 B.data['commitMessage'] = '%s\n' % (B.subject,)
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004577 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
4578 self.waitUntilSettled()
Paul Belanger0e155e22016-11-14 14:12:23 -05004579
Tobias Henkel6b9390f2017-03-28 11:23:21 +02004580 # Cycle was removed so now zuul should have reported again on A
4581 self.assertEqual(A.reported, 2)
4582
4583 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
4584 self.waitUntilSettled()
4585 self.assertEqual(B.reported, 2)
James E. Blair92464a22016-04-05 10:21:26 -07004586
Jesse Keatingcc67b122017-04-19 14:54:57 -07004587 @simple_layout('layouts/disable_at.yaml')
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004588 def test_disable_at(self):
4589 "Test a pipeline will only report to the disabled trigger when failing"
4590
Jesse Keatingcc67b122017-04-19 14:54:57 -07004591 tenant = self.sched.abide.tenants.get('tenant-one')
Paul Belanger7dc76e82016-11-11 16:51:08 -05004592 self.assertEqual(3, tenant.layout.pipelines['check'].disable_at)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004593 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004594 0, tenant.layout.pipelines['check']._consecutive_failures)
4595 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004596
4597 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4598 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
4599 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
4600 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
4601 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
4602 F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F')
4603 G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G')
4604 H = self.fake_gerrit.addFakeChange('org/project', 'master', 'H')
4605 I = self.fake_gerrit.addFakeChange('org/project', 'master', 'I')
4606 J = self.fake_gerrit.addFakeChange('org/project', 'master', 'J')
4607 K = self.fake_gerrit.addFakeChange('org/project', 'master', 'K')
4608
Paul Belanger174a8272017-03-14 13:20:10 -04004609 self.executor_server.failJob('project-test1', A)
4610 self.executor_server.failJob('project-test1', B)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004611 # Let C pass, resetting the counter
Paul Belanger174a8272017-03-14 13:20:10 -04004612 self.executor_server.failJob('project-test1', D)
4613 self.executor_server.failJob('project-test1', E)
4614 self.executor_server.failJob('project-test1', F)
4615 self.executor_server.failJob('project-test1', G)
4616 self.executor_server.failJob('project-test1', H)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004617 # I also passes but should only report to the disabled reporters
Paul Belanger174a8272017-03-14 13:20:10 -04004618 self.executor_server.failJob('project-test1', J)
4619 self.executor_server.failJob('project-test1', K)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004620
4621 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4622 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4623 self.waitUntilSettled()
4624
4625 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004626 2, tenant.layout.pipelines['check']._consecutive_failures)
4627 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004628
4629 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4630 self.waitUntilSettled()
4631
4632 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004633 0, tenant.layout.pipelines['check']._consecutive_failures)
4634 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004635
4636 self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1))
4637 self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1))
4638 self.fake_gerrit.addEvent(F.getPatchsetCreatedEvent(1))
4639 self.waitUntilSettled()
4640
4641 # We should be disabled now
4642 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004643 3, tenant.layout.pipelines['check']._consecutive_failures)
4644 self.assertTrue(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004645
4646 # We need to wait between each of these patches to make sure the
4647 # smtp messages come back in an expected order
4648 self.fake_gerrit.addEvent(G.getPatchsetCreatedEvent(1))
4649 self.waitUntilSettled()
4650 self.fake_gerrit.addEvent(H.getPatchsetCreatedEvent(1))
4651 self.waitUntilSettled()
4652 self.fake_gerrit.addEvent(I.getPatchsetCreatedEvent(1))
4653 self.waitUntilSettled()
4654
4655 # The first 6 (ABCDEF) jobs should have reported back to gerrt thus
4656 # leaving a message on each change
4657 self.assertEqual(1, len(A.messages))
4658 self.assertIn('Build failed.', A.messages[0])
4659 self.assertEqual(1, len(B.messages))
4660 self.assertIn('Build failed.', B.messages[0])
4661 self.assertEqual(1, len(C.messages))
4662 self.assertIn('Build succeeded.', C.messages[0])
4663 self.assertEqual(1, len(D.messages))
4664 self.assertIn('Build failed.', D.messages[0])
4665 self.assertEqual(1, len(E.messages))
4666 self.assertIn('Build failed.', E.messages[0])
4667 self.assertEqual(1, len(F.messages))
4668 self.assertIn('Build failed.', F.messages[0])
4669
4670 # The last 3 (GHI) would have only reported via smtp.
4671 self.assertEqual(3, len(self.smtp_messages))
4672 self.assertEqual(0, len(G.messages))
4673 self.assertIn('Build failed.', self.smtp_messages[0]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004674 self.assertIn(
Monty Taylorde8242c2017-02-23 20:29:53 -06004675 'project-test1 finger://', self.smtp_messages[0]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004676 self.assertEqual(0, len(H.messages))
4677 self.assertIn('Build failed.', self.smtp_messages[1]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004678 self.assertIn(
Monty Taylorde8242c2017-02-23 20:29:53 -06004679 'project-test1 finger://', self.smtp_messages[1]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004680 self.assertEqual(0, len(I.messages))
4681 self.assertIn('Build succeeded.', self.smtp_messages[2]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004682 self.assertIn(
Monty Taylorde8242c2017-02-23 20:29:53 -06004683 'project-test1 finger://', self.smtp_messages[2]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004684
4685 # Now reload the configuration (simulate a HUP) to check the pipeline
4686 # comes out of disabled
4687 self.sched.reconfigure(self.config)
4688
Jesse Keatingcc67b122017-04-19 14:54:57 -07004689 tenant = self.sched.abide.tenants.get('tenant-one')
Paul Belanger7dc76e82016-11-11 16:51:08 -05004690
4691 self.assertEqual(3, tenant.layout.pipelines['check'].disable_at)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004692 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004693 0, tenant.layout.pipelines['check']._consecutive_failures)
4694 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004695
4696 self.fake_gerrit.addEvent(J.getPatchsetCreatedEvent(1))
4697 self.fake_gerrit.addEvent(K.getPatchsetCreatedEvent(1))
4698 self.waitUntilSettled()
4699
4700 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004701 2, tenant.layout.pipelines['check']._consecutive_failures)
4702 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004703
4704 # J and K went back to gerrit
4705 self.assertEqual(1, len(J.messages))
4706 self.assertIn('Build failed.', J.messages[0])
4707 self.assertEqual(1, len(K.messages))
4708 self.assertIn('Build failed.', K.messages[0])
4709 # No more messages reported via smtp
4710 self.assertEqual(3, len(self.smtp_messages))
Joshua Heskethd6dbd682015-12-22 10:06:54 +11004711
James E. Blaircc020532017-04-19 13:04:44 -07004712 @simple_layout('layouts/one-job-project.yaml')
4713 def test_one_job_project(self):
4714 "Test that queueing works with one job"
4715 A = self.fake_gerrit.addFakeChange('org/one-job-project',
4716 'master', 'A')
4717 B = self.fake_gerrit.addFakeChange('org/one-job-project',
4718 'master', 'B')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004719 A.addApproval('Code-Review', 2)
4720 B.addApproval('Code-Review', 2)
4721 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
4722 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
James E. Blaircc020532017-04-19 13:04:44 -07004723 self.waitUntilSettled()
4724
4725 self.assertEqual(A.data['status'], 'MERGED')
4726 self.assertEqual(A.reported, 2)
4727 self.assertEqual(B.data['status'], 'MERGED')
4728 self.assertEqual(B.reported, 2)
4729
Paul Belanger32023542017-10-06 14:48:50 -04004730 def test_job_aborted(self):
4731 "Test that if a execute server aborts a job, it is run again"
4732 self.executor_server.hold_jobs_in_build = True
4733 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4734 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4735 self.waitUntilSettled()
4736
4737 self.executor_server.release('.*-merge')
4738 self.waitUntilSettled()
4739
4740 self.assertEqual(len(self.builds), 2)
Tobias Henkel26fa8a32017-10-07 07:08:36 +00004741
4742 # first abort
4743 self.builds[0].aborted = True
4744 self.executor_server.release('.*-test*')
4745 self.waitUntilSettled()
4746 self.assertEqual(len(self.builds), 1)
4747
4748 # second abort
4749 self.builds[0].aborted = True
4750 self.executor_server.release('.*-test*')
4751 self.waitUntilSettled()
4752 self.assertEqual(len(self.builds), 1)
4753
4754 # third abort
4755 self.builds[0].aborted = True
4756 self.executor_server.release('.*-test*')
4757 self.waitUntilSettled()
4758 self.assertEqual(len(self.builds), 1)
4759
4760 # fourth abort
Paul Belanger32023542017-10-06 14:48:50 -04004761 self.builds[0].aborted = True
4762 self.executor_server.release('.*-test*')
4763 self.waitUntilSettled()
4764 self.assertEqual(len(self.builds), 1)
4765
4766 self.executor_server.hold_jobs_in_build = False
4767 self.executor_server.release()
4768 self.waitUntilSettled()
4769
Tobias Henkel26fa8a32017-10-07 07:08:36 +00004770 self.assertEqual(len(self.history), 7)
4771 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 4)
Paul Belanger32023542017-10-06 14:48:50 -04004772 self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3)
4773
Paul Belanger71d98172016-11-08 10:56:31 -05004774 def test_rerun_on_abort(self):
Paul Belanger174a8272017-03-14 13:20:10 -04004775 "Test that if a execute server fails to run a job, it is run again"
Paul Belanger71d98172016-11-08 10:56:31 -05004776
Paul Belanger174a8272017-03-14 13:20:10 -04004777 self.executor_server.hold_jobs_in_build = True
Paul Belanger71d98172016-11-08 10:56:31 -05004778 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4779 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4780 self.waitUntilSettled()
4781
Paul Belanger174a8272017-03-14 13:20:10 -04004782 self.executor_server.release('.*-merge')
Paul Belanger71d98172016-11-08 10:56:31 -05004783 self.waitUntilSettled()
4784
4785 self.assertEqual(len(self.builds), 2)
4786 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04004787 self.executor_server.release('.*-test*')
Paul Belanger71d98172016-11-08 10:56:31 -05004788 self.waitUntilSettled()
4789
Clint Byrum5bb5feb2016-12-08 12:39:05 -08004790 for x in range(3):
Clint Byrumdf0a55b2016-12-05 06:39:11 -08004791 self.assertEqual(len(self.builds), 1,
4792 'len of builds at x=%d is wrong' % x)
Paul Belanger71d98172016-11-08 10:56:31 -05004793 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04004794 self.executor_server.release('.*-test1')
Paul Belanger71d98172016-11-08 10:56:31 -05004795 self.waitUntilSettled()
4796
Paul Belanger174a8272017-03-14 13:20:10 -04004797 self.executor_server.hold_jobs_in_build = False
4798 self.executor_server.release()
Paul Belanger71d98172016-11-08 10:56:31 -05004799 self.waitUntilSettled()
Clint Byrum5bb5feb2016-12-08 12:39:05 -08004800 self.assertEqual(len(self.history), 6)
Paul Belanger71d98172016-11-08 10:56:31 -05004801 self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 2)
4802 self.assertEqual(A.reported, 1)
4803 self.assertIn('RETRY_LIMIT', A.messages[0])
Joshua Hesketh3f7def32016-11-21 17:36:44 +11004804
James E. Blair15be0e12017-01-03 13:45:20 -08004805 def test_zookeeper_disconnect(self):
Paul Belanger174a8272017-03-14 13:20:10 -04004806 "Test that jobs are executed after a zookeeper disconnect"
James E. Blair15be0e12017-01-03 13:45:20 -08004807
4808 self.fake_nodepool.paused = True
4809 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004810 A.addApproval('Code-Review', 2)
4811 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair15be0e12017-01-03 13:45:20 -08004812 self.waitUntilSettled()
4813
4814 self.zk.client.stop()
4815 self.zk.client.start()
4816 self.fake_nodepool.paused = False
4817 self.waitUntilSettled()
4818
4819 self.assertEqual(A.data['status'], 'MERGED')
4820 self.assertEqual(A.reported, 2)
4821
James E. Blair6ab79e02017-01-06 10:10:17 -08004822 def test_nodepool_failure(self):
4823 "Test that jobs are reported after a nodepool failure"
4824
4825 self.fake_nodepool.paused = True
4826 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004827 A.addApproval('Code-Review', 2)
4828 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blair6ab79e02017-01-06 10:10:17 -08004829 self.waitUntilSettled()
4830
4831 req = self.fake_nodepool.getNodeRequests()[0]
4832 self.fake_nodepool.addFailRequest(req)
4833
4834 self.fake_nodepool.paused = False
4835 self.waitUntilSettled()
4836
4837 self.assertEqual(A.data['status'], 'NEW')
4838 self.assertEqual(A.reported, 2)
4839 self.assertIn('project-merge : NODE_FAILURE', A.messages[1])
4840 self.assertIn('project-test1 : SKIPPED', A.messages[1])
4841 self.assertIn('project-test2 : SKIPPED', A.messages[1])
4842
Monty Taylor6dc5bc12017-09-29 15:47:31 -05004843 def test_nodepool_priority(self):
4844 "Test that nodes are requested at the correct priority"
4845
4846 self.fake_nodepool.paused = True
4847
4848 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4849 self.fake_gerrit.addEvent(A.getRefUpdatedEvent())
4850
4851 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
4852 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4853
4854 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
4855 C.addApproval('Code-Review', 2)
4856 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
4857
4858 self.waitUntilSettled()
4859
4860 reqs = self.fake_nodepool.getNodeRequests()
4861
4862 # The requests come back sorted by oid. Since we have three requests
4863 # for the three changes each with a different priority.
4864 # Also they get a serial number based on order they were received
4865 # so the number on the endof the oid should map to order submitted.
4866
4867 # * gate first - high priority - change C
4868 self.assertEqual(reqs[0]['_oid'], '100-0000000002')
4869 self.assertEqual(reqs[0]['node_types'], ['label1'])
4870 # * check second - normal priority - change B
4871 self.assertEqual(reqs[1]['_oid'], '200-0000000001')
4872 self.assertEqual(reqs[1]['node_types'], ['label1'])
4873 # * post third - low priority - change A
4874 # additionally, the post job defined uses an ubuntu-xenial node,
4875 # so we include that check just as an extra verification
4876 self.assertEqual(reqs[2]['_oid'], '300-0000000000')
4877 self.assertEqual(reqs[2]['node_types'], ['ubuntu-xenial'])
4878
4879 self.fake_nodepool.paused = False
4880 self.waitUntilSettled()
4881
James E. Blairfceaf412017-09-29 13:44:57 -07004882 @simple_layout('layouts/multiple-templates.yaml')
4883 def test_multiple_project_templates(self):
4884 # Test that applying multiple project templates to a project
4885 # doesn't alter them when used for a second project.
4886 A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A')
4887 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4888 self.waitUntilSettled()
4889
4890 build = self.getJobFromHistory('py27')
4891 self.assertEqual(build.parameters['zuul']['jobtags'], [])
4892
James E. Blair29c77002017-10-05 14:56:35 -07004893 def test_pending_merge_in_reconfig(self):
4894 # Test that if we are waiting for an outstanding merge on
4895 # reconfiguration that we continue to do so.
4896 self.gearman_server.hold_merge_jobs_in_queue = True
4897 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4898 A.setMerged()
4899 self.fake_gerrit.addEvent(A.getRefUpdatedEvent())
4900 self.waitUntilSettled()
4901 # Reconfigure while we still have an outstanding merge job
4902 self.sched.reconfigureTenant(self.sched.abide.tenants['tenant-one'],
4903 None)
4904 self.waitUntilSettled()
4905 # Verify the merge job is still running and that the item is
4906 # in the pipeline
4907 self.assertEqual(len(self.sched.merger.jobs), 1)
4908 tenant = self.sched.abide.tenants.get('tenant-one')
4909 pipeline = tenant.layout.pipelines['post']
4910 self.assertEqual(len(pipeline.getAllItems()), 1)
4911 self.gearman_server.hold_merge_jobs_in_queue = False
4912 self.gearman_server.release()
4913 self.waitUntilSettled()
4914
Arieb6f068c2016-10-09 13:11:06 +03004915
James E. Blaira002b032017-04-18 10:35:48 -07004916class TestExecutor(ZuulTestCase):
4917 tenant_config_file = 'config/single-tenant/main.yaml'
4918
4919 def assertFinalState(self):
4920 # In this test, we expect to shut down in a non-final state,
4921 # so skip these checks.
4922 pass
4923
4924 def assertCleanShutdown(self):
4925 self.log.debug("Assert clean shutdown")
4926
4927 # After shutdown, make sure no jobs are running
4928 self.assertEqual({}, self.executor_server.job_workers)
4929
4930 # Make sure that git.Repo objects have been garbage collected.
4931 repos = []
4932 gc.collect()
4933 for obj in gc.get_objects():
4934 if isinstance(obj, git.Repo):
4935 self.log.debug("Leaked git repo object: %s" % repr(obj))
4936 repos.append(obj)
4937 self.assertEqual(len(repos), 0)
4938
4939 def test_executor_shutdown(self):
4940 "Test that the executor can shut down with jobs running"
4941
4942 self.executor_server.hold_jobs_in_build = True
4943 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004944 A.addApproval('Code-Review', 2)
4945 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
James E. Blaira002b032017-04-18 10:35:48 -07004946 self.waitUntilSettled()
4947
4948
Fredrik Medleyf8aec832015-09-28 13:40:20 +02004949class TestDependencyGraph(ZuulTestCase):
4950 tenant_config_file = 'config/dependency-graph/main.yaml'
4951
4952 def test_dependeny_graph_dispatch_jobs_once(self):
4953 "Test a job in a dependency graph is queued only once"
4954 # Job dependencies, starting with A
4955 # A
4956 # / \
4957 # B C
4958 # / \ / \
4959 # D F E
4960 # |
4961 # G
4962
4963 self.executor_server.hold_jobs_in_build = True
4964 change = self.fake_gerrit.addFakeChange(
4965 'org/project', 'master', 'change')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02004966 change.addApproval('Code-Review', 2)
4967 self.fake_gerrit.addEvent(change.addApproval('Approved', 1))
Fredrik Medleyf8aec832015-09-28 13:40:20 +02004968
4969 self.waitUntilSettled()
4970 self.assertEqual([b.name for b in self.builds], ['A'])
4971
4972 self.executor_server.release('A')
4973 self.waitUntilSettled()
4974 self.assertEqual(sorted(b.name for b in self.builds), ['B', 'C'])
4975
4976 self.executor_server.release('B')
4977 self.waitUntilSettled()
4978 self.assertEqual(sorted(b.name for b in self.builds), ['C', 'D'])
4979
4980 self.executor_server.release('D')
4981 self.waitUntilSettled()
4982 self.assertEqual([b.name for b in self.builds], ['C'])
4983
4984 self.executor_server.release('C')
4985 self.waitUntilSettled()
4986 self.assertEqual(sorted(b.name for b in self.builds), ['E', 'F'])
4987
4988 self.executor_server.release('F')
4989 self.waitUntilSettled()
4990 self.assertEqual(sorted(b.name for b in self.builds), ['E', 'G'])
4991
4992 self.executor_server.release('G')
4993 self.waitUntilSettled()
4994 self.assertEqual([b.name for b in self.builds], ['E'])
4995
4996 self.executor_server.release('E')
4997 self.waitUntilSettled()
4998 self.assertEqual(len(self.builds), 0)
4999
5000 self.executor_server.hold_jobs_in_build = False
5001 self.executor_server.release()
5002 self.waitUntilSettled()
5003
5004 self.assertEqual(len(self.builds), 0)
5005 self.assertEqual(len(self.history), 7)
5006
5007 self.assertEqual(change.data['status'], 'MERGED')
5008 self.assertEqual(change.reported, 2)
5009
5010 def test_jobs_launched_only_if_all_dependencies_are_successful(self):
5011 "Test that a job waits till all dependencies are successful"
5012 # Job dependencies, starting with A
5013 # A
5014 # / \
5015 # B C*
5016 # / \ / \
5017 # D F E
5018 # |
5019 # G
5020
5021 self.executor_server.hold_jobs_in_build = True
5022 change = self.fake_gerrit.addFakeChange(
5023 'org/project', 'master', 'change')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005024 change.addApproval('Code-Review', 2)
Fredrik Medleyf8aec832015-09-28 13:40:20 +02005025
5026 self.executor_server.failJob('C', change)
5027
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005028 self.fake_gerrit.addEvent(change.addApproval('Approved', 1))
Fredrik Medleyf8aec832015-09-28 13:40:20 +02005029
5030 self.waitUntilSettled()
5031 self.assertEqual([b.name for b in self.builds], ['A'])
5032
5033 self.executor_server.release('A')
5034 self.waitUntilSettled()
5035 self.assertEqual(sorted(b.name for b in self.builds), ['B', 'C'])
5036
5037 self.executor_server.release('B')
5038 self.waitUntilSettled()
5039 self.assertEqual(sorted(b.name for b in self.builds), ['C', 'D'])
5040
5041 self.executor_server.release('D')
5042 self.waitUntilSettled()
5043 self.assertEqual([b.name for b in self.builds], ['C'])
5044
5045 self.executor_server.release('C')
5046 self.waitUntilSettled()
5047 self.assertEqual(len(self.builds), 0)
5048
5049 self.executor_server.hold_jobs_in_build = False
5050 self.executor_server.release()
5051 self.waitUntilSettled()
5052
5053 self.assertEqual(len(self.builds), 0)
5054 self.assertEqual(len(self.history), 4)
5055
5056 self.assertEqual(change.data['status'], 'NEW')
5057 self.assertEqual(change.reported, 2)
5058
5059
Arieb6f068c2016-10-09 13:11:06 +03005060class TestDuplicatePipeline(ZuulTestCase):
5061 tenant_config_file = 'config/duplicate-pipeline/main.yaml'
5062
5063 def test_duplicate_pipelines(self):
5064 "Test that a change matching multiple pipelines works"
5065
5066 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
5067 self.fake_gerrit.addEvent(A.getChangeRestoredEvent())
5068 self.waitUntilSettled()
5069
5070 self.assertHistory([
5071 dict(name='project-test1', result='SUCCESS', changes='1,1',
5072 pipeline='dup1'),
5073 dict(name='project-test1', result='SUCCESS', changes='1,1',
5074 pipeline='dup2'),
Paul Belanger73a7d8e2016-11-09 11:12:42 -05005075 ], ordered=False)
Arieb6f068c2016-10-09 13:11:06 +03005076
5077 self.assertEqual(len(A.messages), 2)
5078
Paul Belangera46a3742016-11-09 14:23:03 -05005079 if 'dup1' in A.messages[0]:
5080 self.assertIn('dup1', A.messages[0])
5081 self.assertNotIn('dup2', A.messages[0])
5082 self.assertIn('project-test1', A.messages[0])
5083 self.assertIn('dup2', A.messages[1])
5084 self.assertNotIn('dup1', A.messages[1])
5085 self.assertIn('project-test1', A.messages[1])
5086 else:
5087 self.assertIn('dup1', A.messages[1])
5088 self.assertNotIn('dup2', A.messages[1])
5089 self.assertIn('project-test1', A.messages[1])
5090 self.assertIn('dup2', A.messages[0])
5091 self.assertNotIn('dup1', A.messages[0])
5092 self.assertIn('project-test1', A.messages[0])
Paul Belangerfac69ba2016-11-03 09:03:13 -04005093
5094
Paul Belanger86085b32016-11-03 12:48:57 -04005095class TestSchedulerTemplatedProject(ZuulTestCase):
5096 tenant_config_file = 'config/templated-project/main.yaml'
5097
Paul Belanger174a8272017-03-14 13:20:10 -04005098 def test_job_from_templates_executed(self):
5099 "Test whether a job generated via a template can be executed"
Paul Belanger86085b32016-11-03 12:48:57 -04005100
5101 A = self.fake_gerrit.addFakeChange(
5102 'org/templated-project', 'master', 'A')
5103 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5104 self.waitUntilSettled()
5105
5106 self.assertEqual(self.getJobFromHistory('project-test1').result,
5107 'SUCCESS')
5108 self.assertEqual(self.getJobFromHistory('project-test2').result,
5109 'SUCCESS')
Paul Belanger3adf72f2016-11-03 14:57:31 -04005110
5111 def test_layered_templates(self):
Paul Belanger174a8272017-03-14 13:20:10 -04005112 "Test whether a job generated via a template can be executed"
Paul Belanger3adf72f2016-11-03 14:57:31 -04005113
5114 A = self.fake_gerrit.addFakeChange(
5115 'org/layered-project', 'master', 'A')
5116 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5117 self.waitUntilSettled()
5118
5119 self.assertEqual(self.getJobFromHistory('project-test1').result,
5120 'SUCCESS')
5121 self.assertEqual(self.getJobFromHistory('project-test2').result,
5122 'SUCCESS')
5123 self.assertEqual(self.getJobFromHistory('layered-project-test3'
5124 ).result, 'SUCCESS')
5125 self.assertEqual(self.getJobFromHistory('layered-project-test4'
5126 ).result, 'SUCCESS')
5127 self.assertEqual(self.getJobFromHistory('layered-project-foo-test5'
5128 ).result, 'SUCCESS')
5129 self.assertEqual(self.getJobFromHistory('project-test6').result,
5130 'SUCCESS')
Adam Gandelman94a60062016-11-21 16:43:14 -08005131
James E. Blaire74f5712017-09-29 15:14:31 -07005132 def test_unimplied_branch_matchers(self):
5133 # This tests that there are no implied branch matchers added
5134 # by project templates.
5135 self.create_branch('org/layered-project', 'stable')
5136
5137 A = self.fake_gerrit.addFakeChange(
5138 'org/layered-project', 'stable', 'A')
5139
5140 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5141 self.waitUntilSettled()
5142
5143 self.assertEqual(self.getJobFromHistory('project-test1').result,
5144 'SUCCESS')
5145 print(self.getJobFromHistory('project-test1').
5146 parameters['zuul']['_inheritance_path'])
5147
5148 def test_implied_branch_matchers(self):
5149 # This tests that there is an implied branch matcher when a
5150 # template is used on an in-repo project pipeline definition.
5151 self.create_branch('untrusted-config', 'stable')
5152 self.fake_gerrit.addEvent(
5153 self.fake_gerrit.getFakeBranchCreatedEvent(
5154 'untrusted-config', 'stable'))
5155 self.waitUntilSettled()
5156
5157 A = self.fake_gerrit.addFakeChange(
5158 'untrusted-config', 'stable', 'A')
5159
5160 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5161 self.waitUntilSettled()
5162
5163 self.assertEqual(self.getJobFromHistory('project-test1').result,
5164 'SUCCESS')
5165 print(self.getJobFromHistory('project-test1').
5166 parameters['zuul']['_inheritance_path'])
5167
Adam Gandelman94a60062016-11-21 16:43:14 -08005168
5169class TestSchedulerSuccessURL(ZuulTestCase):
5170 tenant_config_file = 'config/success-url/main.yaml'
5171
5172 def test_success_url(self):
5173 "Ensure bad build params are ignored"
5174 self.sched.reconfigure(self.config)
5175 self.init_repo('org/docs')
5176
5177 A = self.fake_gerrit.addFakeChange('org/docs', 'master', 'A')
5178 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5179 self.waitUntilSettled()
5180
5181 # Both builds ran: docs-draft-test + docs-draft-test2
5182 self.assertEqual(len(self.history), 2)
5183
5184 # Grab build id
James E. Blaire7576802016-12-21 16:15:00 -08005185 for build in self.history:
5186 if build.name == 'docs-draft-test':
5187 uuid = build.uuid[:7]
Monty Taylorde8242c2017-02-23 20:29:53 -06005188 elif build.name == 'docs-draft-test2':
5189 uuid_test2 = build.uuid
Adam Gandelman94a60062016-11-21 16:43:14 -08005190
5191 # Two msgs: 'Starting...' + results
5192 self.assertEqual(len(self.smtp_messages), 2)
5193 body = self.smtp_messages[1]['body'].splitlines()
5194 self.assertEqual('Build succeeded.', body[0])
5195
5196 self.assertIn(
5197 '- docs-draft-test http://docs-draft.example.org/1/1/1/check/'
5198 'docs-draft-test/%s/publish-docs/' % uuid,
5199 body[2])
5200
Paul Belanger174a8272017-03-14 13:20:10 -04005201 # NOTE: This default URL is currently hard-coded in executor/server.py
Adam Gandelman94a60062016-11-21 16:43:14 -08005202 self.assertIn(
Monty Taylor51139a02016-05-24 11:28:10 -05005203 '- docs-draft-test2 finger://{hostname}/{uuid}'.format(
5204 hostname=self.executor_server.hostname,
Monty Taylorde8242c2017-02-23 20:29:53 -06005205 uuid=uuid_test2),
Adam Gandelman94a60062016-11-21 16:43:14 -08005206 body[3])
Adam Gandelman8bd57102016-12-02 12:58:42 -08005207
5208
Adam Gandelman4da00f62016-12-09 15:47:33 -08005209class TestSchedulerMerges(ZuulTestCase):
5210 tenant_config_file = 'config/merges/main.yaml'
Adam Gandelman8bd57102016-12-02 12:58:42 -08005211
5212 def _test_project_merge_mode(self, mode):
Paul Belanger174a8272017-03-14 13:20:10 -04005213 self.executor_server.keep_jobdir = False
Adam Gandelman8bd57102016-12-02 12:58:42 -08005214 project = 'org/project-%s' % mode
Paul Belanger174a8272017-03-14 13:20:10 -04005215 self.executor_server.hold_jobs_in_build = True
Adam Gandelman8bd57102016-12-02 12:58:42 -08005216 A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
5217 B = self.fake_gerrit.addFakeChange(project, 'master', 'B')
5218 C = self.fake_gerrit.addFakeChange(project, 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005219 A.addApproval('Code-Review', 2)
5220 B.addApproval('Code-Review', 2)
5221 C.addApproval('Code-Review', 2)
5222 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
5223 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
5224 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Adam Gandelman8bd57102016-12-02 12:58:42 -08005225 self.waitUntilSettled()
5226
5227 build = self.builds[-1]
James E. Blair2a535672017-04-27 12:03:15 -07005228 path = os.path.join(build.jobdir.src_root, 'review.example.com',
5229 project)
Adam Gandelman8bd57102016-12-02 12:58:42 -08005230 repo = git.Repo(path)
James E. Blair247cab72017-07-20 16:52:36 -07005231 repo_messages = [c.message.strip() for c in repo.iter_commits()]
Adam Gandelman8bd57102016-12-02 12:58:42 -08005232 repo_messages.reverse()
5233
Paul Belanger174a8272017-03-14 13:20:10 -04005234 self.executor_server.hold_jobs_in_build = False
5235 self.executor_server.release()
Adam Gandelman8bd57102016-12-02 12:58:42 -08005236 self.waitUntilSettled()
5237
5238 return repo_messages
5239
5240 def _test_merge(self, mode):
5241 us_path = os.path.join(
5242 self.upstream_root, 'org/project-%s' % mode)
5243 expected_messages = [
5244 'initial commit',
5245 'add content from fixture',
5246 # the intermediate commits order is nondeterministic
5247 "Merge commit 'refs/changes/1/2/1' of %s into HEAD" % us_path,
5248 "Merge commit 'refs/changes/1/3/1' of %s into HEAD" % us_path,
5249 ]
5250 result = self._test_project_merge_mode(mode)
5251 self.assertEqual(result[:2], expected_messages[:2])
5252 self.assertEqual(result[-2:], expected_messages[-2:])
5253
5254 def test_project_merge_mode_merge(self):
5255 self._test_merge('merge')
5256
5257 def test_project_merge_mode_merge_resolve(self):
5258 self._test_merge('merge-resolve')
5259
5260 def test_project_merge_mode_cherrypick(self):
5261 expected_messages = [
5262 'initial commit',
5263 'add content from fixture',
5264 'A-1',
5265 'B-1',
5266 'C-1']
5267 result = self._test_project_merge_mode('cherry-pick')
5268 self.assertEqual(result, expected_messages)
Adam Gandelman4da00f62016-12-09 15:47:33 -08005269
5270 def test_merge_branch(self):
5271 "Test that the right commits are on alternate branches"
5272 self.create_branch('org/project-merge-branches', 'mp')
5273
Paul Belanger174a8272017-03-14 13:20:10 -04005274 self.executor_server.hold_jobs_in_build = True
Adam Gandelman4da00f62016-12-09 15:47:33 -08005275 A = self.fake_gerrit.addFakeChange(
5276 'org/project-merge-branches', 'mp', 'A')
5277 B = self.fake_gerrit.addFakeChange(
5278 'org/project-merge-branches', 'mp', 'B')
5279 C = self.fake_gerrit.addFakeChange(
5280 'org/project-merge-branches', 'mp', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005281 A.addApproval('Code-Review', 2)
5282 B.addApproval('Code-Review', 2)
5283 C.addApproval('Code-Review', 2)
5284 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
5285 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
5286 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Adam Gandelman4da00f62016-12-09 15:47:33 -08005287 self.waitUntilSettled()
5288
Paul Belanger174a8272017-03-14 13:20:10 -04005289 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005290 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04005291 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005292 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04005293 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005294 self.waitUntilSettled()
5295
5296 build = self.builds[-1]
James E. Blair3b222492017-07-21 15:17:37 -07005297 self.assertEqual(build.parameters['zuul']['branch'], 'mp')
James E. Blair2a535672017-04-27 12:03:15 -07005298 path = os.path.join(build.jobdir.src_root, 'review.example.com',
5299 'org/project-merge-branches')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005300 repo = git.Repo(path)
5301
James E. Blair247cab72017-07-20 16:52:36 -07005302 repo_messages = [c.message.strip() for c in repo.iter_commits()]
Adam Gandelman4da00f62016-12-09 15:47:33 -08005303 repo_messages.reverse()
5304 correct_messages = [
5305 'initial commit',
5306 'add content from fixture',
5307 'mp commit',
5308 'A-1', 'B-1', 'C-1']
5309 self.assertEqual(repo_messages, correct_messages)
5310
Paul Belanger174a8272017-03-14 13:20:10 -04005311 self.executor_server.hold_jobs_in_build = False
5312 self.executor_server.release()
Adam Gandelman4da00f62016-12-09 15:47:33 -08005313 self.waitUntilSettled()
5314
5315 def test_merge_multi_branch(self):
5316 "Test that dependent changes on multiple branches are merged"
5317 self.create_branch('org/project-merge-branches', 'mp')
5318
Paul Belanger174a8272017-03-14 13:20:10 -04005319 self.executor_server.hold_jobs_in_build = True
Adam Gandelman4da00f62016-12-09 15:47:33 -08005320 A = self.fake_gerrit.addFakeChange(
5321 'org/project-merge-branches', 'master', 'A')
5322 B = self.fake_gerrit.addFakeChange(
5323 'org/project-merge-branches', 'mp', 'B')
5324 C = self.fake_gerrit.addFakeChange(
5325 'org/project-merge-branches', 'master', 'C')
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005326 A.addApproval('Code-Review', 2)
5327 B.addApproval('Code-Review', 2)
5328 C.addApproval('Code-Review', 2)
5329 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
5330 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
5331 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Adam Gandelman4da00f62016-12-09 15:47:33 -08005332 self.waitUntilSettled()
5333
5334 job_A = None
5335 for job in self.builds:
5336 if 'project-merge' in job.name:
5337 job_A = job
Adam Gandelman4da00f62016-12-09 15:47:33 -08005338
James E. Blair2a535672017-04-27 12:03:15 -07005339 path = os.path.join(job_A.jobdir.src_root, 'review.example.com',
5340 'org/project-merge-branches')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005341 repo = git.Repo(path)
5342 repo_messages = [c.message.strip()
James E. Blair247cab72017-07-20 16:52:36 -07005343 for c in repo.iter_commits()]
Adam Gandelman4da00f62016-12-09 15:47:33 -08005344 repo_messages.reverse()
5345 correct_messages = [
5346 'initial commit', 'add content from fixture', 'A-1']
5347 self.assertEqual(repo_messages, correct_messages)
5348
Paul Belanger174a8272017-03-14 13:20:10 -04005349 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005350 self.waitUntilSettled()
5351
5352 job_B = None
5353 for job in self.builds:
5354 if 'project-merge' in job.name:
5355 job_B = job
Adam Gandelman4da00f62016-12-09 15:47:33 -08005356
James E. Blair2a535672017-04-27 12:03:15 -07005357 path = os.path.join(job_B.jobdir.src_root, 'review.example.com',
5358 'org/project-merge-branches')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005359 repo = git.Repo(path)
James E. Blair247cab72017-07-20 16:52:36 -07005360 repo_messages = [c.message.strip() for c in repo.iter_commits()]
Adam Gandelman4da00f62016-12-09 15:47:33 -08005361 repo_messages.reverse()
5362 correct_messages = [
5363 'initial commit', 'add content from fixture', 'mp commit', 'B-1']
5364 self.assertEqual(repo_messages, correct_messages)
5365
Paul Belanger174a8272017-03-14 13:20:10 -04005366 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005367 self.waitUntilSettled()
5368
5369 job_C = None
5370 for job in self.builds:
5371 if 'project-merge' in job.name:
5372 job_C = job
James E. Blairb1345832017-07-21 14:51:35 -07005373
James E. Blair2a535672017-04-27 12:03:15 -07005374 path = os.path.join(job_C.jobdir.src_root, 'review.example.com',
5375 'org/project-merge-branches')
Adam Gandelman4da00f62016-12-09 15:47:33 -08005376 repo = git.Repo(path)
James E. Blair247cab72017-07-20 16:52:36 -07005377 repo_messages = [c.message.strip() for c in repo.iter_commits()]
Adam Gandelman4da00f62016-12-09 15:47:33 -08005378
5379 repo_messages.reverse()
5380 correct_messages = [
5381 'initial commit', 'add content from fixture',
5382 'A-1', 'C-1']
5383 # Ensure the right commits are in the history for this ref
5384 self.assertEqual(repo_messages, correct_messages)
5385
Paul Belanger174a8272017-03-14 13:20:10 -04005386 self.executor_server.hold_jobs_in_build = False
5387 self.executor_server.release()
Adam Gandelman4da00f62016-12-09 15:47:33 -08005388 self.waitUntilSettled()
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005389
5390
James E. Blair9ea0d0b2017-04-20 09:27:15 -07005391class TestSemaphore(ZuulTestCase):
5392 tenant_config_file = 'config/semaphore/main.yaml'
5393
5394 def test_semaphore_one(self):
5395 "Test semaphores with max=1 (mutex)"
5396 tenant = self.sched.abide.tenants.get('tenant-one')
5397
5398 self.executor_server.hold_jobs_in_build = True
5399
5400 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
5401 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
5402 self.assertFalse('test-semaphore' in
5403 tenant.semaphore_handler.semaphores)
5404
5405 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5406 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
5407 self.waitUntilSettled()
5408
5409 self.assertEqual(len(self.builds), 3)
5410 self.assertEqual(self.builds[0].name, 'project-test1')
5411 self.assertEqual(self.builds[1].name, 'semaphore-one-test1')
5412 self.assertEqual(self.builds[2].name, 'project-test1')
5413
5414 self.executor_server.release('semaphore-one-test1')
5415 self.waitUntilSettled()
5416
5417 self.assertEqual(len(self.builds), 3)
5418 self.assertEqual(self.builds[0].name, 'project-test1')
5419 self.assertEqual(self.builds[1].name, 'project-test1')
5420 self.assertEqual(self.builds[2].name, 'semaphore-one-test2')
5421 self.assertTrue('test-semaphore' in
5422 tenant.semaphore_handler.semaphores)
5423
5424 self.executor_server.release('semaphore-one-test2')
5425 self.waitUntilSettled()
5426
5427 self.assertEqual(len(self.builds), 3)
5428 self.assertEqual(self.builds[0].name, 'project-test1')
5429 self.assertEqual(self.builds[1].name, 'project-test1')
5430 self.assertEqual(self.builds[2].name, 'semaphore-one-test1')
5431 self.assertTrue('test-semaphore' in
5432 tenant.semaphore_handler.semaphores)
5433
5434 self.executor_server.release('semaphore-one-test1')
5435 self.waitUntilSettled()
5436
5437 self.assertEqual(len(self.builds), 3)
5438 self.assertEqual(self.builds[0].name, 'project-test1')
5439 self.assertEqual(self.builds[1].name, 'project-test1')
5440 self.assertEqual(self.builds[2].name, 'semaphore-one-test2')
5441 self.assertTrue('test-semaphore' in
5442 tenant.semaphore_handler.semaphores)
5443
5444 self.executor_server.release('semaphore-one-test2')
5445 self.waitUntilSettled()
5446
5447 self.assertEqual(len(self.builds), 2)
5448 self.assertEqual(self.builds[0].name, 'project-test1')
5449 self.assertEqual(self.builds[1].name, 'project-test1')
5450 self.assertFalse('test-semaphore' in
5451 tenant.semaphore_handler.semaphores)
5452
5453 self.executor_server.hold_jobs_in_build = False
5454 self.executor_server.release()
5455
5456 self.waitUntilSettled()
5457 self.assertEqual(len(self.builds), 0)
5458
5459 self.assertEqual(A.reported, 1)
5460 self.assertEqual(B.reported, 1)
5461 self.assertFalse('test-semaphore' in
5462 tenant.semaphore_handler.semaphores)
5463
5464 def test_semaphore_two(self):
5465 "Test semaphores with max>1"
5466 tenant = self.sched.abide.tenants.get('tenant-one')
5467
5468 self.executor_server.hold_jobs_in_build = True
5469 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
5470 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
5471 self.assertFalse('test-semaphore-two' in
5472 tenant.semaphore_handler.semaphores)
5473
5474 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5475 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
5476 self.waitUntilSettled()
5477
5478 self.assertEqual(len(self.builds), 4)
5479 self.assertEqual(self.builds[0].name, 'project-test1')
5480 self.assertEqual(self.builds[1].name, 'semaphore-two-test1')
5481 self.assertEqual(self.builds[2].name, 'semaphore-two-test2')
5482 self.assertEqual(self.builds[3].name, 'project-test1')
5483 self.assertTrue('test-semaphore-two' in
5484 tenant.semaphore_handler.semaphores)
5485 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5486 'test-semaphore-two', [])), 2)
5487
5488 self.executor_server.release('semaphore-two-test1')
5489 self.waitUntilSettled()
5490
5491 self.assertEqual(len(self.builds), 4)
5492 self.assertEqual(self.builds[0].name, 'project-test1')
5493 self.assertEqual(self.builds[1].name, 'semaphore-two-test2')
5494 self.assertEqual(self.builds[2].name, 'project-test1')
5495 self.assertEqual(self.builds[3].name, 'semaphore-two-test1')
5496 self.assertTrue('test-semaphore-two' in
5497 tenant.semaphore_handler.semaphores)
5498 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5499 'test-semaphore-two', [])), 2)
5500
5501 self.executor_server.release('semaphore-two-test2')
5502 self.waitUntilSettled()
5503
5504 self.assertEqual(len(self.builds), 4)
5505 self.assertEqual(self.builds[0].name, 'project-test1')
5506 self.assertEqual(self.builds[1].name, 'project-test1')
5507 self.assertEqual(self.builds[2].name, 'semaphore-two-test1')
5508 self.assertEqual(self.builds[3].name, 'semaphore-two-test2')
5509 self.assertTrue('test-semaphore-two' in
5510 tenant.semaphore_handler.semaphores)
5511 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5512 'test-semaphore-two', [])), 2)
5513
5514 self.executor_server.release('semaphore-two-test1')
5515 self.waitUntilSettled()
5516
5517 self.assertEqual(len(self.builds), 3)
5518 self.assertEqual(self.builds[0].name, 'project-test1')
5519 self.assertEqual(self.builds[1].name, 'project-test1')
5520 self.assertEqual(self.builds[2].name, 'semaphore-two-test2')
5521 self.assertTrue('test-semaphore-two' in
5522 tenant.semaphore_handler.semaphores)
5523 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5524 'test-semaphore-two', [])), 1)
5525
5526 self.executor_server.release('semaphore-two-test2')
5527 self.waitUntilSettled()
5528
5529 self.assertEqual(len(self.builds), 2)
5530 self.assertEqual(self.builds[0].name, 'project-test1')
5531 self.assertEqual(self.builds[1].name, 'project-test1')
5532 self.assertFalse('test-semaphore-two' in
5533 tenant.semaphore_handler.semaphores)
5534
5535 self.executor_server.hold_jobs_in_build = False
5536 self.executor_server.release()
5537
5538 self.waitUntilSettled()
5539 self.assertEqual(len(self.builds), 0)
5540
5541 self.assertEqual(A.reported, 1)
5542 self.assertEqual(B.reported, 1)
5543
5544 def test_semaphore_abandon(self):
5545 "Test abandon with job semaphores"
5546 self.executor_server.hold_jobs_in_build = True
5547 tenant = self.sched.abide.tenants.get('tenant-one')
5548 check_pipeline = tenant.layout.pipelines['check']
5549
5550 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
5551 self.assertFalse('test-semaphore' in
5552 tenant.semaphore_handler.semaphores)
5553
5554 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5555 self.waitUntilSettled()
5556
5557 self.assertTrue('test-semaphore' in
5558 tenant.semaphore_handler.semaphores)
5559
5560 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
5561 self.waitUntilSettled()
5562
5563 # The check pipeline should be empty
5564 items = check_pipeline.getAllItems()
5565 self.assertEqual(len(items), 0)
5566
5567 # The semaphore should be released
5568 self.assertFalse('test-semaphore' in
5569 tenant.semaphore_handler.semaphores)
5570
5571 self.executor_server.hold_jobs_in_build = False
5572 self.executor_server.release()
5573 self.waitUntilSettled()
5574
Tobias Henkel0f714002017-06-30 23:30:52 +02005575 def test_semaphore_new_patchset(self):
5576 "Test new patchset with job semaphores"
5577 self.executor_server.hold_jobs_in_build = True
5578 tenant = self.sched.abide.tenants.get('tenant-one')
5579 check_pipeline = tenant.layout.pipelines['check']
5580
5581 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
5582 self.assertFalse('test-semaphore' in
5583 tenant.semaphore_handler.semaphores)
5584
5585 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5586 self.waitUntilSettled()
5587
5588 self.assertTrue('test-semaphore' in
5589 tenant.semaphore_handler.semaphores)
5590 semaphore = tenant.semaphore_handler.semaphores['test-semaphore']
5591 self.assertEqual(len(semaphore), 1)
5592
5593 A.addPatchset()
5594 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
5595 self.waitUntilSettled()
5596
5597 self.assertTrue('test-semaphore' in
5598 tenant.semaphore_handler.semaphores)
5599 semaphore = tenant.semaphore_handler.semaphores['test-semaphore']
5600 self.assertEqual(len(semaphore), 1)
5601
5602 items = check_pipeline.getAllItems()
5603 self.assertEqual(items[0].change.number, '1')
5604 self.assertEqual(items[0].change.patchset, '2')
5605 self.assertTrue(items[0].live)
5606
5607 self.executor_server.hold_jobs_in_build = False
5608 self.executor_server.release()
5609 self.waitUntilSettled()
5610
5611 # The semaphore should be released
5612 self.assertFalse('test-semaphore' in
5613 tenant.semaphore_handler.semaphores)
5614
James E. Blair9ea0d0b2017-04-20 09:27:15 -07005615 def test_semaphore_reconfigure(self):
5616 "Test reconfigure with job semaphores"
5617 self.executor_server.hold_jobs_in_build = True
5618 tenant = self.sched.abide.tenants.get('tenant-one')
5619 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
5620 self.assertFalse('test-semaphore' in
5621 tenant.semaphore_handler.semaphores)
5622
5623 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5624 self.waitUntilSettled()
5625
5626 self.assertTrue('test-semaphore' in
5627 tenant.semaphore_handler.semaphores)
5628
5629 # reconfigure without layout change
5630 self.sched.reconfigure(self.config)
5631 self.waitUntilSettled()
5632 tenant = self.sched.abide.tenants.get('tenant-one')
5633
5634 # semaphore still must be held
5635 self.assertTrue('test-semaphore' in
5636 tenant.semaphore_handler.semaphores)
5637
5638 self.commitConfigUpdate(
5639 'common-config',
5640 'config/semaphore/zuul-reconfiguration.yaml')
5641 self.sched.reconfigure(self.config)
5642 self.waitUntilSettled()
5643 tenant = self.sched.abide.tenants.get('tenant-one')
5644
5645 self.executor_server.release('project-test1')
5646 self.waitUntilSettled()
5647
5648 # There should be no builds anymore
5649 self.assertEqual(len(self.builds), 0)
5650
5651 # The semaphore should be released
5652 self.assertFalse('test-semaphore' in
5653 tenant.semaphore_handler.semaphores)
5654
5655
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005656class TestSemaphoreMultiTenant(ZuulTestCase):
5657 tenant_config_file = 'config/multi-tenant-semaphore/main.yaml'
5658
5659 def test_semaphore_tenant_isolation(self):
5660 "Test semaphores in multiple tenants"
5661
5662 self.waitUntilSettled()
5663 tenant_one = self.sched.abide.tenants.get('tenant-one')
5664 tenant_two = self.sched.abide.tenants.get('tenant-two')
5665
5666 self.executor_server.hold_jobs_in_build = True
5667 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
5668 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
5669 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
5670 D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D')
5671 E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E')
5672 self.assertFalse('test-semaphore' in
5673 tenant_one.semaphore_handler.semaphores)
5674 self.assertFalse('test-semaphore' in
5675 tenant_two.semaphore_handler.semaphores)
5676
5677 # add patches to project1 of tenant-one
5678 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
5679 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
5680 self.waitUntilSettled()
5681
5682 # one build of project1-test1 must run
5683 # semaphore of tenant-one must be acquired once
5684 # semaphore of tenant-two must not be acquired
5685 self.assertEqual(len(self.builds), 1)
5686 self.assertEqual(self.builds[0].name, 'project1-test1')
5687 self.assertTrue('test-semaphore' in
5688 tenant_one.semaphore_handler.semaphores)
5689 self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get(
5690 'test-semaphore', [])), 1)
5691 self.assertFalse('test-semaphore' in
5692 tenant_two.semaphore_handler.semaphores)
5693
5694 # add patches to project2 of tenant-two
5695 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
5696 self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1))
5697 self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1))
5698 self.waitUntilSettled()
5699
5700 # one build of project1-test1 must run
5701 # two builds of project2-test1 must run
5702 # semaphore of tenant-one must be acquired once
5703 # semaphore of tenant-two must be acquired twice
5704 self.assertEqual(len(self.builds), 3)
5705 self.assertEqual(self.builds[0].name, 'project1-test1')
5706 self.assertEqual(self.builds[1].name, 'project2-test1')
5707 self.assertEqual(self.builds[2].name, 'project2-test1')
5708 self.assertTrue('test-semaphore' in
5709 tenant_one.semaphore_handler.semaphores)
5710 self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get(
5711 'test-semaphore', [])), 1)
5712 self.assertTrue('test-semaphore' in
5713 tenant_two.semaphore_handler.semaphores)
5714 self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get(
5715 'test-semaphore', [])), 2)
5716
5717 self.executor_server.release('project1-test1')
5718 self.waitUntilSettled()
5719
5720 # one build of project1-test1 must run
5721 # two builds of project2-test1 must run
5722 # semaphore of tenant-one must be acquired once
5723 # semaphore of tenant-two must be acquired twice
5724 self.assertEqual(len(self.builds), 3)
5725 self.assertEqual(self.builds[0].name, 'project2-test1')
5726 self.assertEqual(self.builds[1].name, 'project2-test1')
5727 self.assertEqual(self.builds[2].name, 'project1-test1')
5728 self.assertTrue('test-semaphore' in
5729 tenant_one.semaphore_handler.semaphores)
5730 self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get(
5731 'test-semaphore', [])), 1)
5732 self.assertTrue('test-semaphore' in
5733 tenant_two.semaphore_handler.semaphores)
5734 self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get(
5735 'test-semaphore', [])), 2)
5736
5737 self.executor_server.release('project2-test1')
5738 self.waitUntilSettled()
5739
5740 # one build of project1-test1 must run
5741 # one build of project2-test1 must run
5742 # semaphore of tenant-one must be acquired once
5743 # semaphore of tenant-two must be acquired once
5744 self.assertEqual(len(self.builds), 2)
5745 self.assertTrue('test-semaphore' in
5746 tenant_one.semaphore_handler.semaphores)
5747 self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get(
5748 'test-semaphore', [])), 1)
5749 self.assertTrue('test-semaphore' in
5750 tenant_two.semaphore_handler.semaphores)
5751 self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get(
5752 'test-semaphore', [])), 1)
5753
5754 self.executor_server.hold_jobs_in_build = False
5755 self.executor_server.release()
5756
5757 self.waitUntilSettled()
5758
5759 # no build must run
5760 # semaphore of tenant-one must not be acquired
5761 # semaphore of tenant-two must not be acquired
5762 self.assertEqual(len(self.builds), 0)
5763 self.assertFalse('test-semaphore' in
5764 tenant_one.semaphore_handler.semaphores)
5765 self.assertFalse('test-semaphore' in
5766 tenant_two.semaphore_handler.semaphores)
5767
5768 self.assertEqual(A.reported, 1)
5769 self.assertEqual(B.reported, 1)
5770
5771
5772class TestSemaphoreInRepo(ZuulTestCase):
Tobias Henkelabf973e2017-07-28 10:07:34 +02005773 config_file = 'zuul-connections-gerrit-and-github.conf'
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005774 tenant_config_file = 'config/in-repo/main.yaml'
5775
5776 def test_semaphore_in_repo(self):
5777 "Test semaphores in repo config"
5778
5779 # This tests dynamic semaphore handling in project repos. The semaphore
5780 # max value should not be evaluated dynamically but must be updated
5781 # after the change lands.
5782
5783 self.waitUntilSettled()
5784 tenant = self.sched.abide.tenants.get('tenant-one')
5785
5786 in_repo_conf = textwrap.dedent(
5787 """
5788 - job:
Tobias Henkelf02cf512017-07-21 22:55:34 +02005789 name: project-test1
5790
5791 - job:
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005792 name: project-test2
5793 semaphore: test-semaphore
5794
5795 - project:
5796 name: org/project
5797 tenant-one-gate:
5798 jobs:
5799 - project-test2
5800
5801 # the max value in dynamic layout must be ignored
5802 - semaphore:
5803 name: test-semaphore
5804 max: 2
5805 """)
5806
5807 in_repo_playbook = textwrap.dedent(
5808 """
5809 - hosts: all
5810 tasks: []
5811 """)
5812
5813 file_dict = {'.zuul.yaml': in_repo_conf,
5814 'playbooks/project-test2.yaml': in_repo_playbook}
5815 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A',
5816 files=file_dict)
5817 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
5818 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
5819 B.setDependsOn(A, 1)
5820 C.setDependsOn(A, 1)
5821
5822 self.executor_server.hold_jobs_in_build = True
5823
Tobias Henkelbf24fd12017-07-27 06:13:07 +02005824 A.addApproval('Code-Review', 2)
5825 B.addApproval('Code-Review', 2)
5826 C.addApproval('Code-Review', 2)
5827 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
5828 self.fake_gerrit.addEvent(B.addApproval('Approved', 1))
5829 self.fake_gerrit.addEvent(C.addApproval('Approved', 1))
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005830 self.waitUntilSettled()
5831
5832 # check that the layout in a queue item still has max value of 1
5833 # for test-semaphore
5834 pipeline = tenant.layout.pipelines.get('tenant-one-gate')
5835 queue = None
5836 for queue_candidate in pipeline.queues:
5837 if queue_candidate.name == 'org/project':
5838 queue = queue_candidate
5839 break
5840 queue_item = queue.queue[0]
James E. Blair29a24fd2017-10-02 15:04:56 -07005841 item_dynamic_layout = queue_item.layout
Tobias Henkel9a0e1942017-03-20 16:16:02 +01005842 dynamic_test_semaphore = \
5843 item_dynamic_layout.semaphores.get('test-semaphore')
5844 self.assertEqual(dynamic_test_semaphore.max, 1)
5845
5846 # one build must be in queue, one semaphores acquired
5847 self.assertEqual(len(self.builds), 1)
5848 self.assertEqual(self.builds[0].name, 'project-test2')
5849 self.assertTrue('test-semaphore' in
5850 tenant.semaphore_handler.semaphores)
5851 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5852 'test-semaphore', [])), 1)
5853
5854 self.executor_server.release('project-test2')
5855 self.waitUntilSettled()
5856
5857 # change A must be merged
5858 self.assertEqual(A.data['status'], 'MERGED')
5859 self.assertEqual(A.reported, 2)
5860
5861 # send change-merged event as the gerrit mock doesn't send it
5862 self.fake_gerrit.addEvent(A.getChangeMergedEvent())
5863 self.waitUntilSettled()
5864
5865 # now that change A was merged, the new semaphore max must be effective
5866 tenant = self.sched.abide.tenants.get('tenant-one')
5867 self.assertEqual(tenant.layout.semaphores.get('test-semaphore').max, 2)
5868
5869 # two builds must be in queue, two semaphores acquired
5870 self.assertEqual(len(self.builds), 2)
5871 self.assertEqual(self.builds[0].name, 'project-test2')
5872 self.assertEqual(self.builds[1].name, 'project-test2')
5873 self.assertTrue('test-semaphore' in
5874 tenant.semaphore_handler.semaphores)
5875 self.assertEqual(len(tenant.semaphore_handler.semaphores.get(
5876 'test-semaphore', [])), 2)
5877
5878 self.executor_server.release('project-test2')
5879 self.waitUntilSettled()
5880
5881 self.assertEqual(len(self.builds), 0)
5882 self.assertFalse('test-semaphore' in
5883 tenant.semaphore_handler.semaphores)
5884
5885 self.executor_server.hold_jobs_in_build = False
5886 self.executor_server.release()
5887
5888 self.waitUntilSettled()
5889 self.assertEqual(len(self.builds), 0)
5890
5891 self.assertEqual(A.reported, 2)
5892 self.assertEqual(B.reported, 2)
5893 self.assertEqual(C.reported, 2)
David Shrewsburyf6dc1762017-10-02 13:34:37 -04005894
5895
5896class TestSchedulerBranchMatcher(ZuulTestCase):
5897
5898 @simple_layout('layouts/matcher-test.yaml')
5899 def test_job_branch_ignored(self):
5900 '''
5901 Test that branch matching logic works.
5902
5903 The 'ignore-branch' job has a branch matcher that is supposed to
5904 match every branch except for the 'featureA' branch, so it should
5905 not be run on a change to that branch.
5906 '''
5907 self.create_branch('org/project', 'featureA')
5908 A = self.fake_gerrit.addFakeChange('org/project', 'featureA', 'A')
5909 A.addApproval('Code-Review', 2)
5910 self.fake_gerrit.addEvent(A.addApproval('Approved', 1))
5911 self.waitUntilSettled()
5912 self.printHistory()
5913 self.assertEqual(self.getJobFromHistory('project-test1').result,
5914 'SUCCESS')
5915 self.assertJobNotInHistory('ignore-branch')
5916 self.assertEqual(A.data['status'], 'MERGED')
5917 self.assertEqual(A.reported, 2,
5918 "A should report start and success")
5919 self.assertIn('gate', A.messages[1],
5920 "A should transit gate")