blob: e32e41bc081e0d189b6e9b412f3127d35c735e95 [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. Blairb0fcae42012-07-17 11:12:10 -070017import json
Monty Taylorbc758832013-06-17 17:22:42 -040018import os
James E. Blairb0fcae42012-07-17 11:12:10 -070019import re
James E. Blair4886cc12012-07-18 15:39:41 -070020import shutil
Monty Taylorbc758832013-06-17 17:22:42 -040021import time
James E. Blairec056492016-07-22 09:45:56 -070022from unittest import skip
Monty Taylorbc758832013-06-17 17:22:42 -040023
James E. Blair4886cc12012-07-18 15:39:41 -070024import git
Morgan Fainberg293f7f82016-05-30 14:01:22 -070025from six.moves import urllib
Monty Taylorbc758832013-06-17 17:22:42 -040026import testtools
James E. Blairb0fcae42012-07-17 11:12:10 -070027
Maru Newby3fe5f852015-01-13 04:22:14 +000028import zuul.change_matcher
James E. Blairb0fcae42012-07-17 11:12:10 -070029import zuul.scheduler
James E. Blairad28e912013-11-27 10:43:22 -080030import zuul.rpcclient
Paul Belanger9bba4902016-11-02 16:07:33 -040031import zuul.model
James E. Blairb0fcae42012-07-17 11:12:10 -070032
Maru Newby3fe5f852015-01-13 04:22:14 +000033from tests.base import (
Maru Newby3fe5f852015-01-13 04:22:14 +000034 ZuulTestCase,
35 repack_repo,
36)
James E. Blairb0fcae42012-07-17 11:12:10 -070037
James E. Blairb0fcae42012-07-17 11:12:10 -070038
Clark Boylanb640e052014-04-03 16:41:46 -070039class TestScheduler(ZuulTestCase):
James E. Blair552b54f2016-07-22 13:55:32 -070040 tenant_config_file = 'config/single-tenant/main.yaml'
Antoine Mussobd86a312014-01-08 14:51:33 +010041
Paul Belanger174a8272017-03-14 13:20:10 -040042 def test_jobs_executed(self):
43 "Test that jobs are executed and a change is merged"
James E. Blair1f4c2bb2013-04-26 08:40:46 -070044
James E. Blairb0fcae42012-07-17 11:12:10 -070045 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -070046 A.addApproval('code-review', 2)
47 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blairb0fcae42012-07-17 11:12:10 -070048 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -040049 self.assertEqual(self.getJobFromHistory('project-merge').result,
50 'SUCCESS')
51 self.assertEqual(self.getJobFromHistory('project-test1').result,
52 'SUCCESS')
53 self.assertEqual(self.getJobFromHistory('project-test2').result,
54 'SUCCESS')
55 self.assertEqual(A.data['status'], 'MERGED')
56 self.assertEqual(A.reported, 2)
James E. Blair34776ee2016-08-25 13:53:54 -070057 self.assertEqual(self.getJobFromHistory('project-test1').node,
58 'image1')
Adam Gandelmaneace4692017-02-07 15:18:36 -080059 self.assertIsNone(self.getJobFromHistory('project-test2').node)
James E. Blairb0fcae42012-07-17 11:12:10 -070060
James E. Blair552b54f2016-07-22 13:55:32 -070061 # TODOv3(jeblair): we may want to report stats by tenant (also?).
James E. Blair66eeebf2013-07-27 17:44:32 -070062 self.assertReportedStat('gerrit.event.comment-added', value='1|c')
63 self.assertReportedStat('zuul.pipeline.gate.current_changes',
64 value='1|g')
65 self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS',
66 kind='ms')
67 self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS',
68 value='1|c')
69 self.assertReportedStat('zuul.pipeline.gate.resident_time', kind='ms')
70 self.assertReportedStat('zuul.pipeline.gate.total_changes',
71 value='1|c')
James E. Blair412e5582013-04-22 15:50:12 -070072 self.assertReportedStat(
James E. Blair66eeebf2013-07-27 17:44:32 -070073 'zuul.pipeline.gate.org.project.resident_time', kind='ms')
James E. Blair412e5582013-04-22 15:50:12 -070074 self.assertReportedStat(
James E. Blair66eeebf2013-07-27 17:44:32 -070075 'zuul.pipeline.gate.org.project.total_changes', value='1|c')
James E. Blair412e5582013-04-22 15:50:12 -070076
James E. Blair5821bd92015-09-16 08:48:15 -070077 for build in self.builds:
78 self.assertEqual(build.parameters['ZUUL_VOTING'], '1')
79
James E. Blair3cb10702013-08-24 08:56:03 -070080 def test_initial_pipeline_gauges(self):
81 "Test that each pipeline reported its length on start"
James E. Blair7da51b72016-07-25 15:29:43 -070082 self.assertReportedStat('zuul.pipeline.gate.current_changes',
83 value='0|g')
84 self.assertReportedStat('zuul.pipeline.check.current_changes',
85 value='0|g')
James E. Blair3cb10702013-08-24 08:56:03 -070086
James E. Blair34776ee2016-08-25 13:53:54 -070087 def test_job_branch(self):
88 "Test the correct variant of a job runs on a branch"
89 self.create_branch('org/project', 'stable')
90 A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A')
91 A.addApproval('code-review', 2)
92 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
93 self.waitUntilSettled()
94 self.assertEqual(self.getJobFromHistory('project-test1').result,
95 'SUCCESS')
96 self.assertEqual(self.getJobFromHistory('project-test2').result,
97 'SUCCESS')
98 self.assertEqual(A.data['status'], 'MERGED')
99 self.assertEqual(A.reported, 2,
100 "A should report start and success")
101 self.assertIn('gate', A.messages[1],
102 "A should transit gate")
103 self.assertEqual(self.getJobFromHistory('project-test1').node,
104 'image2')
105
James E. Blairb0fcae42012-07-17 11:12:10 -0700106 def test_parallel_changes(self):
107 "Test that changes are tested in parallel and merged in series"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700108
Paul Belanger174a8272017-03-14 13:20:10 -0400109 self.executor_server.hold_jobs_in_build = True
James E. Blairb0fcae42012-07-17 11:12:10 -0700110 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
111 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
112 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700113 A.addApproval('code-review', 2)
114 B.addApproval('code-review', 2)
115 C.addApproval('code-review', 2)
James E. Blairb0fcae42012-07-17 11:12:10 -0700116
James E. Blair8b5408c2016-08-08 15:37:46 -0700117 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
118 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
119 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blairb0fcae42012-07-17 11:12:10 -0700120
121 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400122 self.assertEqual(len(self.builds), 1)
123 self.assertEqual(self.builds[0].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700124 self.assertTrue(self.builds[0].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700125
Paul Belanger174a8272017-03-14 13:20:10 -0400126 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700127 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400128 self.assertEqual(len(self.builds), 3)
129 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700130 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400131 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700132 self.assertTrue(self.builds[1].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400133 self.assertEqual(self.builds[2].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700134 self.assertTrue(self.builds[2].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700135
Paul Belanger174a8272017-03-14 13:20:10 -0400136 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700137 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400138 self.assertEqual(len(self.builds), 5)
139 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700140 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400141 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700142 self.assertTrue(self.builds[1].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700143
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400144 self.assertEqual(self.builds[2].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700145 self.assertTrue(self.builds[2].hasChanges(A, B))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400146 self.assertEqual(self.builds[3].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700147 self.assertTrue(self.builds[3].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700148
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400149 self.assertEqual(self.builds[4].name, 'project-merge')
James E. Blair791b5392016-08-03 11:25:56 -0700150 self.assertTrue(self.builds[4].hasChanges(A, B, C))
James E. Blairb0fcae42012-07-17 11:12:10 -0700151
Paul Belanger174a8272017-03-14 13:20:10 -0400152 self.executor_server.release('.*-merge')
James E. Blairb0fcae42012-07-17 11:12:10 -0700153 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400154 self.assertEqual(len(self.builds), 6)
155 self.assertEqual(self.builds[0].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700156 self.assertTrue(self.builds[0].hasChanges(A))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400157 self.assertEqual(self.builds[1].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700158 self.assertTrue(self.builds[1].hasChanges(A))
James E. Blairb0fcae42012-07-17 11:12:10 -0700159
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400160 self.assertEqual(self.builds[2].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700161 self.assertTrue(self.builds[2].hasChanges(A, B))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400162 self.assertEqual(self.builds[3].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700163 self.assertTrue(self.builds[3].hasChanges(A, B))
James E. Blairb0fcae42012-07-17 11:12:10 -0700164
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400165 self.assertEqual(self.builds[4].name, 'project-test1')
James E. Blair791b5392016-08-03 11:25:56 -0700166 self.assertTrue(self.builds[4].hasChanges(A, B, C))
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400167 self.assertEqual(self.builds[5].name, 'project-test2')
James E. Blair791b5392016-08-03 11:25:56 -0700168 self.assertTrue(self.builds[5].hasChanges(A, B, C))
James E. Blairb0fcae42012-07-17 11:12:10 -0700169
Paul Belanger174a8272017-03-14 13:20:10 -0400170 self.executor_server.hold_jobs_in_build = False
171 self.executor_server.release()
James E. Blairb0fcae42012-07-17 11:12:10 -0700172 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400173 self.assertEqual(len(self.builds), 0)
James E. Blairb0fcae42012-07-17 11:12:10 -0700174
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400175 self.assertEqual(len(self.history), 9)
176 self.assertEqual(A.data['status'], 'MERGED')
177 self.assertEqual(B.data['status'], 'MERGED')
178 self.assertEqual(C.data['status'], 'MERGED')
179 self.assertEqual(A.reported, 2)
180 self.assertEqual(B.reported, 2)
181 self.assertEqual(C.reported, 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700182
183 def test_failed_changes(self):
184 "Test that a change behind a failed change is retested"
Paul Belanger174a8272017-03-14 13:20:10 -0400185 self.executor_server.hold_jobs_in_build = True
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700186
James E. Blairb02a3bb2012-07-30 17:49:55 -0700187 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
188 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -0700189 A.addApproval('code-review', 2)
190 B.addApproval('code-review', 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700191
Paul Belanger174a8272017-03-14 13:20:10 -0400192 self.executor_server.failJob('project-test1', A)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700193
James E. Blair8b5408c2016-08-08 15:37:46 -0700194 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
195 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blairb02a3bb2012-07-30 17:49:55 -0700196 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700197 self.assertBuilds([dict(name='project-merge', changes='1,1')])
James E. Blaire2819012013-06-28 17:17:26 -0400198
Paul Belanger174a8272017-03-14 13:20:10 -0400199 self.executor_server.release('.*-merge')
James E. Blaire2819012013-06-28 17:17:26 -0400200 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700201 # A/project-merge is complete
202 self.assertBuilds([
203 dict(name='project-test1', changes='1,1'),
204 dict(name='project-test2', changes='1,1'),
205 dict(name='project-merge', changes='1,1 2,1'),
206 ])
James E. Blaire2819012013-06-28 17:17:26 -0400207
Paul Belanger174a8272017-03-14 13:20:10 -0400208 self.executor_server.release('.*-merge')
James E. Blaire2819012013-06-28 17:17:26 -0400209 self.waitUntilSettled()
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700210 # A/project-merge is complete
211 # B/project-merge is complete
212 self.assertBuilds([
213 dict(name='project-test1', changes='1,1'),
214 dict(name='project-test2', changes='1,1'),
215 dict(name='project-test1', changes='1,1 2,1'),
216 dict(name='project-test2', changes='1,1 2,1'),
217 ])
218
219 # Release project-test1 for A which will fail. This will
Paul Belanger174a8272017-03-14 13:20:10 -0400220 # abort both running B jobs and reexecute project-merge for B.
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700221 self.builds[0].release()
222 self.waitUntilSettled()
223
224 self.orderedRelease()
225 self.assertHistory([
226 dict(name='project-merge', result='SUCCESS', changes='1,1'),
227 dict(name='project-merge', result='SUCCESS', changes='1,1 2,1'),
228 dict(name='project-test1', result='FAILURE', changes='1,1'),
229 dict(name='project-test1', result='ABORTED', changes='1,1 2,1'),
230 dict(name='project-test2', result='ABORTED', changes='1,1 2,1'),
231 dict(name='project-test2', result='SUCCESS', changes='1,1'),
232 dict(name='project-merge', result='SUCCESS', changes='2,1'),
233 dict(name='project-test1', result='SUCCESS', changes='2,1'),
234 dict(name='project-test2', result='SUCCESS', changes='2,1'),
James E. Blairb536ecc2016-08-31 10:11:42 -0700235 ], ordered=False)
James E. Blair2b2a8ab2016-08-11 14:39:11 -0700236
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400237 self.assertEqual(A.data['status'], 'NEW')
238 self.assertEqual(B.data['status'], 'MERGED')
239 self.assertEqual(A.reported, 2)
240 self.assertEqual(B.reported, 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700241
242 def test_independent_queues(self):
243 "Test that changes end up in the right queues"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700244
Paul Belanger174a8272017-03-14 13:20:10 -0400245 self.executor_server.hold_jobs_in_build = True
Zhongyue Luo5d556072012-09-21 02:00:47 +0900246 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blairb02a3bb2012-07-30 17:49:55 -0700247 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
248 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700249 A.addApproval('code-review', 2)
250 B.addApproval('code-review', 2)
251 C.addApproval('code-review', 2)
James E. Blairb02a3bb2012-07-30 17:49:55 -0700252
James E. Blair8b5408c2016-08-08 15:37:46 -0700253 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blairf59f3cf2017-02-19 14:50:26 -0800254 self.waitUntilSettled()
James E. Blairb02a3bb2012-07-30 17:49:55 -0700255
James E. Blairf59f3cf2017-02-19 14:50:26 -0800256 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
257 self.waitUntilSettled()
258
259 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blairb02a3bb2012-07-30 17:49:55 -0700260 self.waitUntilSettled()
261
262 # There should be one merge job at the head of each queue running
James E. Blair5f0d49e2016-08-19 09:36:50 -0700263 self.assertBuilds([
264 dict(name='project-merge', changes='1,1'),
265 dict(name='project-merge', changes='2,1'),
266 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700267
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700268 # Release the current merge builds
James E. Blair5f0d49e2016-08-19 09:36:50 -0700269 self.builds[0].release()
270 self.waitUntilSettled()
271 self.builds[0].release()
James E. Blairb02a3bb2012-07-30 17:49:55 -0700272 self.waitUntilSettled()
273 # Release the merge job for project2 which is behind project1
Paul Belanger174a8272017-03-14 13:20:10 -0400274 self.executor_server.release('.*-merge')
James E. Blairb02a3bb2012-07-30 17:49:55 -0700275 self.waitUntilSettled()
276
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700277 # All the test builds should be running:
James E. Blair5f0d49e2016-08-19 09:36:50 -0700278 self.assertBuilds([
279 dict(name='project-test1', changes='1,1'),
280 dict(name='project-test2', changes='1,1'),
281 dict(name='project-test1', changes='2,1'),
282 dict(name='project-test2', changes='2,1'),
Paul Belanger58bf6912016-11-11 19:36:01 -0500283 dict(name='project1-project2-integration', changes='2,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700284 dict(name='project-test1', changes='2,1 3,1'),
285 dict(name='project-test2', changes='2,1 3,1'),
Clint Byrumcd9393f2016-12-21 12:21:07 -0800286 dict(name='project1-project2-integration', changes='2,1 3,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700287 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700288
James E. Blair5f0d49e2016-08-19 09:36:50 -0700289 self.orderedRelease()
290 self.assertHistory([
291 dict(name='project-merge', result='SUCCESS', changes='1,1'),
292 dict(name='project-merge', result='SUCCESS', changes='2,1'),
293 dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'),
294 dict(name='project-test1', result='SUCCESS', changes='1,1'),
295 dict(name='project-test2', result='SUCCESS', changes='1,1'),
296 dict(name='project-test1', result='SUCCESS', changes='2,1'),
297 dict(name='project-test2', result='SUCCESS', changes='2,1'),
Paul Belanger58bf6912016-11-11 19:36:01 -0500298 dict(
299 name='project1-project2-integration',
300 result='SUCCESS',
301 changes='2,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700302 dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'),
303 dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'),
Clint Byrumcd9393f2016-12-21 12:21:07 -0800304 dict(name='project1-project2-integration',
305 result='SUCCESS',
306 changes='2,1 3,1'),
James E. Blair5f0d49e2016-08-19 09:36:50 -0700307 ])
James E. Blairb02a3bb2012-07-30 17:49:55 -0700308
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400309 self.assertEqual(A.data['status'], 'MERGED')
310 self.assertEqual(B.data['status'], 'MERGED')
311 self.assertEqual(C.data['status'], 'MERGED')
312 self.assertEqual(A.reported, 2)
313 self.assertEqual(B.reported, 2)
314 self.assertEqual(C.reported, 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700315
316 def test_failed_change_at_head(self):
317 "Test that if a change at the head fails, jobs behind it are canceled"
James E. Blaird466dc42012-07-31 10:42:56 -0700318
Paul Belanger174a8272017-03-14 13:20:10 -0400319 self.executor_server.hold_jobs_in_build = True
James E. Blaird466dc42012-07-31 10:42:56 -0700320 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
321 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
322 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700323 A.addApproval('code-review', 2)
324 B.addApproval('code-review', 2)
325 C.addApproval('code-review', 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700326
Paul Belanger174a8272017-03-14 13:20:10 -0400327 self.executor_server.failJob('project-test1', A)
James E. Blaird466dc42012-07-31 10:42:56 -0700328
James E. Blair8b5408c2016-08-08 15:37:46 -0700329 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
330 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
331 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blaird466dc42012-07-31 10:42:56 -0700332
333 self.waitUntilSettled()
James E. Blaird466dc42012-07-31 10:42:56 -0700334
James E. Blairb536ecc2016-08-31 10:11:42 -0700335 self.assertBuilds([
336 dict(name='project-merge', changes='1,1'),
337 ])
James E. Blaird466dc42012-07-31 10:42:56 -0700338
Paul Belanger174a8272017-03-14 13:20:10 -0400339 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700340 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400341 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700342 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400343 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700344 self.waitUntilSettled()
345
James E. Blairb536ecc2016-08-31 10:11:42 -0700346 self.assertBuilds([
347 dict(name='project-test1', changes='1,1'),
348 dict(name='project-test2', changes='1,1'),
349 dict(name='project-test1', changes='1,1 2,1'),
350 dict(name='project-test2', changes='1,1 2,1'),
351 dict(name='project-test1', changes='1,1 2,1 3,1'),
352 dict(name='project-test2', changes='1,1 2,1 3,1'),
353 ])
James E. Blaird466dc42012-07-31 10:42:56 -0700354
Monty Taylor6bef8ef2013-06-02 08:17:12 -0400355 self.release(self.builds[0])
James E. Blaird466dc42012-07-31 10:42:56 -0700356 self.waitUntilSettled()
357
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400358 # project-test2, project-merge for B
James E. Blairb536ecc2016-08-31 10:11:42 -0700359 self.assertBuilds([
360 dict(name='project-test2', changes='1,1'),
361 dict(name='project-merge', changes='2,1'),
362 ])
363 # Unordered history comparison because the aborts can finish
364 # in any order.
365 self.assertHistory([
366 dict(name='project-merge', result='SUCCESS',
367 changes='1,1'),
368 dict(name='project-merge', result='SUCCESS',
369 changes='1,1 2,1'),
370 dict(name='project-merge', result='SUCCESS',
371 changes='1,1 2,1 3,1'),
372 dict(name='project-test1', result='FAILURE',
373 changes='1,1'),
374 dict(name='project-test1', result='ABORTED',
375 changes='1,1 2,1'),
376 dict(name='project-test2', result='ABORTED',
377 changes='1,1 2,1'),
378 dict(name='project-test1', result='ABORTED',
379 changes='1,1 2,1 3,1'),
380 dict(name='project-test2', result='ABORTED',
381 changes='1,1 2,1 3,1'),
382 ], ordered=False)
James E. Blaird466dc42012-07-31 10:42:56 -0700383
Paul Belanger174a8272017-03-14 13:20:10 -0400384 self.executor_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700385 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400386 self.executor_server.release('.*-merge')
James E. Blairb536ecc2016-08-31 10:11:42 -0700387 self.waitUntilSettled()
388 self.orderedRelease()
James E. Blaird466dc42012-07-31 10:42:56 -0700389
James E. Blairb536ecc2016-08-31 10:11:42 -0700390 self.assertBuilds([])
391 self.assertHistory([
392 dict(name='project-merge', result='SUCCESS',
393 changes='1,1'),
394 dict(name='project-merge', result='SUCCESS',
395 changes='1,1 2,1'),
396 dict(name='project-merge', result='SUCCESS',
397 changes='1,1 2,1 3,1'),
398 dict(name='project-test1', result='FAILURE',
399 changes='1,1'),
400 dict(name='project-test1', result='ABORTED',
401 changes='1,1 2,1'),
402 dict(name='project-test2', result='ABORTED',
403 changes='1,1 2,1'),
404 dict(name='project-test1', result='ABORTED',
405 changes='1,1 2,1 3,1'),
406 dict(name='project-test2', result='ABORTED',
407 changes='1,1 2,1 3,1'),
408 dict(name='project-merge', result='SUCCESS',
409 changes='2,1'),
410 dict(name='project-merge', result='SUCCESS',
411 changes='2,1 3,1'),
412 dict(name='project-test2', result='SUCCESS',
413 changes='1,1'),
414 dict(name='project-test1', result='SUCCESS',
415 changes='2,1'),
416 dict(name='project-test2', result='SUCCESS',
417 changes='2,1'),
418 dict(name='project-test1', result='SUCCESS',
419 changes='2,1 3,1'),
420 dict(name='project-test2', result='SUCCESS',
421 changes='2,1 3,1'),
422 ], ordered=False)
423
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400424 self.assertEqual(A.data['status'], 'NEW')
425 self.assertEqual(B.data['status'], 'MERGED')
426 self.assertEqual(C.data['status'], 'MERGED')
427 self.assertEqual(A.reported, 2)
428 self.assertEqual(B.reported, 2)
429 self.assertEqual(C.reported, 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700430
James E. Blair0aac4872013-08-23 14:02:38 -0700431 def test_failed_change_in_middle(self):
432 "Test a failed change in the middle of the queue"
433
Paul Belanger174a8272017-03-14 13:20:10 -0400434 self.executor_server.hold_jobs_in_build = True
James E. Blair0aac4872013-08-23 14:02:38 -0700435 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
436 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
437 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700438 A.addApproval('code-review', 2)
439 B.addApproval('code-review', 2)
440 C.addApproval('code-review', 2)
James E. Blair0aac4872013-08-23 14:02:38 -0700441
Paul Belanger174a8272017-03-14 13:20:10 -0400442 self.executor_server.failJob('project-test1', B)
James E. Blair0aac4872013-08-23 14:02:38 -0700443
James E. Blair8b5408c2016-08-08 15:37:46 -0700444 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
445 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
446 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair0aac4872013-08-23 14:02:38 -0700447
448 self.waitUntilSettled()
449
Paul Belanger174a8272017-03-14 13:20:10 -0400450 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700451 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400452 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700453 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400454 self.executor_server.release('.*-merge')
James E. Blair0aac4872013-08-23 14:02:38 -0700455 self.waitUntilSettled()
456
457 self.assertEqual(len(self.builds), 6)
458 self.assertEqual(self.builds[0].name, 'project-test1')
459 self.assertEqual(self.builds[1].name, 'project-test2')
460 self.assertEqual(self.builds[2].name, 'project-test1')
461 self.assertEqual(self.builds[3].name, 'project-test2')
462 self.assertEqual(self.builds[4].name, 'project-test1')
463 self.assertEqual(self.builds[5].name, 'project-test2')
464
465 self.release(self.builds[2])
466 self.waitUntilSettled()
467
James E. Blair972e3c72013-08-29 12:04:55 -0700468 # project-test1 and project-test2 for A
469 # project-test2 for B
470 # project-merge for C (without B)
471 self.assertEqual(len(self.builds), 4)
James E. Blair0aac4872013-08-23 14:02:38 -0700472 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 2)
473
Paul Belanger174a8272017-03-14 13:20:10 -0400474 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -0700475 self.waitUntilSettled()
476
477 # project-test1 and project-test2 for A
478 # project-test2 for B
479 # project-test1 and project-test2 for C
480 self.assertEqual(len(self.builds), 5)
481
Paul Belanger2e2a0492016-10-30 18:33:37 -0400482 tenant = self.sched.abide.tenants.get('tenant-one')
483 items = tenant.layout.pipelines['gate'].getAllItems()
James E. Blair0aac4872013-08-23 14:02:38 -0700484 builds = items[0].current_build_set.getBuilds()
485 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
486 self.assertEqual(self.countJobResults(builds, None), 2)
487 builds = items[1].current_build_set.getBuilds()
488 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
489 self.assertEqual(self.countJobResults(builds, 'FAILURE'), 1)
490 self.assertEqual(self.countJobResults(builds, None), 1)
491 builds = items[2].current_build_set.getBuilds()
492 self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1)
James E. Blair972e3c72013-08-29 12:04:55 -0700493 self.assertEqual(self.countJobResults(builds, None), 2)
James E. Blair0aac4872013-08-23 14:02:38 -0700494
Paul Belanger174a8272017-03-14 13:20:10 -0400495 self.executor_server.hold_jobs_in_build = False
496 self.executor_server.release()
James E. Blair0aac4872013-08-23 14:02:38 -0700497 self.waitUntilSettled()
498
499 self.assertEqual(len(self.builds), 0)
500 self.assertEqual(len(self.history), 12)
501 self.assertEqual(A.data['status'], 'MERGED')
502 self.assertEqual(B.data['status'], 'NEW')
503 self.assertEqual(C.data['status'], 'MERGED')
504 self.assertEqual(A.reported, 2)
505 self.assertEqual(B.reported, 2)
506 self.assertEqual(C.reported, 2)
507
James E. Blaird466dc42012-07-31 10:42:56 -0700508 def test_failed_change_at_head_with_queue(self):
509 "Test that if a change at the head fails, queued jobs are canceled"
James E. Blaird466dc42012-07-31 10:42:56 -0700510
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700511 self.gearman_server.hold_jobs_in_queue = True
James E. Blaird466dc42012-07-31 10:42:56 -0700512 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
513 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
514 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700515 A.addApproval('code-review', 2)
516 B.addApproval('code-review', 2)
517 C.addApproval('code-review', 2)
James E. Blaird466dc42012-07-31 10:42:56 -0700518
Paul Belanger174a8272017-03-14 13:20:10 -0400519 self.executor_server.failJob('project-test1', A)
James E. Blaird466dc42012-07-31 10:42:56 -0700520
James E. Blair8b5408c2016-08-08 15:37:46 -0700521 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
522 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
523 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blaird466dc42012-07-31 10:42:56 -0700524
525 self.waitUntilSettled()
James E. Blair701c5b42013-06-06 09:34:59 -0700526 queue = self.gearman_server.getQueue()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400527 self.assertEqual(len(self.builds), 0)
528 self.assertEqual(len(queue), 1)
Paul Belanger174a8272017-03-14 13:20:10 -0400529 self.assertEqual(queue[0].name, 'executor:execute')
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800530 job_args = json.loads(queue[0].arguments)
531 self.assertEqual(job_args['job'], 'project-merge')
532 self.assertEqual(job_args['items'][0]['number'], '%d' % A.number)
James E. Blaird466dc42012-07-31 10:42:56 -0700533
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700534 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700535 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700536 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700537 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700538 self.gearman_server.release('.*-merge')
James E. Blaird466dc42012-07-31 10:42:56 -0700539 self.waitUntilSettled()
James E. Blair701c5b42013-06-06 09:34:59 -0700540 queue = self.gearman_server.getQueue()
James E. Blaird466dc42012-07-31 10:42:56 -0700541
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400542 self.assertEqual(len(self.builds), 0)
543 self.assertEqual(len(queue), 6)
Clint Byrum8b2bc0c2016-11-16 16:28:50 -0800544
545 self.assertEqual(
546 json.loads(queue[0].arguments)['job'], 'project-test1')
547 self.assertEqual(
548 json.loads(queue[1].arguments)['job'], 'project-test2')
549 self.assertEqual(
550 json.loads(queue[2].arguments)['job'], 'project-test1')
551 self.assertEqual(
552 json.loads(queue[3].arguments)['job'], 'project-test2')
553 self.assertEqual(
554 json.loads(queue[4].arguments)['job'], 'project-test1')
555 self.assertEqual(
556 json.loads(queue[5].arguments)['job'], 'project-test2')
James E. Blaird466dc42012-07-31 10:42:56 -0700557
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700558 self.release(queue[0])
James E. Blaird466dc42012-07-31 10:42:56 -0700559 self.waitUntilSettled()
560
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400561 self.assertEqual(len(self.builds), 0)
James E. Blair701c5b42013-06-06 09:34:59 -0700562 queue = self.gearman_server.getQueue()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400563 self.assertEqual(len(queue), 2) # project-test2, project-merge for B
564 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 0)
James E. Blaird466dc42012-07-31 10:42:56 -0700565
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700566 self.gearman_server.hold_jobs_in_queue = False
567 self.gearman_server.release()
James E. Blaird466dc42012-07-31 10:42:56 -0700568 self.waitUntilSettled()
569
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400570 self.assertEqual(len(self.builds), 0)
571 self.assertEqual(len(self.history), 11)
572 self.assertEqual(A.data['status'], 'NEW')
573 self.assertEqual(B.data['status'], 'MERGED')
574 self.assertEqual(C.data['status'], 'MERGED')
575 self.assertEqual(A.reported, 2)
576 self.assertEqual(B.reported, 2)
577 self.assertEqual(C.reported, 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700578
James E. Blairec056492016-07-22 09:45:56 -0700579 @skip("Disabled for early v3 development")
James E. Blairce8a2132016-05-19 15:21:52 -0700580 def _test_time_database(self, iteration):
Paul Belanger174a8272017-03-14 13:20:10 -0400581 self.executor_server.hold_jobs_in_build = True
James E. Blairce8a2132016-05-19 15:21:52 -0700582 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -0700583 A.addApproval('code-review', 2)
584 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blairce8a2132016-05-19 15:21:52 -0700585 self.waitUntilSettled()
586 time.sleep(2)
587
588 data = json.loads(self.sched.formatStatusJSON())
589 found_job = None
590 for pipeline in data['pipelines']:
591 if pipeline['name'] != 'gate':
592 continue
593 for queue in pipeline['change_queues']:
594 for head in queue['heads']:
595 for item in head:
596 for job in item['jobs']:
597 if job['name'] == 'project-merge':
598 found_job = job
599 break
600
601 self.assertIsNotNone(found_job)
602 if iteration == 1:
603 self.assertIsNotNone(found_job['estimated_time'])
604 self.assertIsNone(found_job['remaining_time'])
605 else:
606 self.assertIsNotNone(found_job['estimated_time'])
607 self.assertTrue(found_job['estimated_time'] >= 2)
608 self.assertIsNotNone(found_job['remaining_time'])
609
Paul Belanger174a8272017-03-14 13:20:10 -0400610 self.executor_server.hold_jobs_in_build = False
611 self.executor_server.release()
James E. Blairce8a2132016-05-19 15:21:52 -0700612 self.waitUntilSettled()
613
James E. Blairec056492016-07-22 09:45:56 -0700614 @skip("Disabled for early v3 development")
James E. Blairce8a2132016-05-19 15:21:52 -0700615 def test_time_database(self):
616 "Test the time database"
617
618 self._test_time_database(1)
619 self._test_time_database(2)
620
James E. Blairfef71632013-09-23 11:15:47 -0700621 def test_two_failed_changes_at_head(self):
622 "Test that changes are reparented correctly if 2 fail at head"
623
Paul Belanger174a8272017-03-14 13:20:10 -0400624 self.executor_server.hold_jobs_in_build = True
James E. Blairfef71632013-09-23 11:15:47 -0700625 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
626 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
627 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700628 A.addApproval('code-review', 2)
629 B.addApproval('code-review', 2)
630 C.addApproval('code-review', 2)
James E. Blairfef71632013-09-23 11:15:47 -0700631
Paul Belanger174a8272017-03-14 13:20:10 -0400632 self.executor_server.failJob('project-test1', A)
633 self.executor_server.failJob('project-test1', B)
James E. Blairfef71632013-09-23 11:15:47 -0700634
James E. Blair8b5408c2016-08-08 15:37:46 -0700635 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
636 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
637 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blairfef71632013-09-23 11:15:47 -0700638 self.waitUntilSettled()
639
Paul Belanger174a8272017-03-14 13:20:10 -0400640 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700641 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400642 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700643 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400644 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700645 self.waitUntilSettled()
646
647 self.assertEqual(len(self.builds), 6)
648 self.assertEqual(self.builds[0].name, 'project-test1')
649 self.assertEqual(self.builds[1].name, 'project-test2')
650 self.assertEqual(self.builds[2].name, 'project-test1')
651 self.assertEqual(self.builds[3].name, 'project-test2')
652 self.assertEqual(self.builds[4].name, 'project-test1')
653 self.assertEqual(self.builds[5].name, 'project-test2')
654
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400655 self.assertTrue(self.builds[0].hasChanges(A))
656 self.assertTrue(self.builds[2].hasChanges(A))
657 self.assertTrue(self.builds[2].hasChanges(B))
658 self.assertTrue(self.builds[4].hasChanges(A))
659 self.assertTrue(self.builds[4].hasChanges(B))
660 self.assertTrue(self.builds[4].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700661
662 # Fail change B first
663 self.release(self.builds[2])
664 self.waitUntilSettled()
665
666 # restart of C after B failure
Paul Belanger174a8272017-03-14 13:20:10 -0400667 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700668 self.waitUntilSettled()
669
670 self.assertEqual(len(self.builds), 5)
671 self.assertEqual(self.builds[0].name, 'project-test1')
672 self.assertEqual(self.builds[1].name, 'project-test2')
673 self.assertEqual(self.builds[2].name, 'project-test2')
674 self.assertEqual(self.builds[3].name, 'project-test1')
675 self.assertEqual(self.builds[4].name, 'project-test2')
676
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400677 self.assertTrue(self.builds[1].hasChanges(A))
678 self.assertTrue(self.builds[2].hasChanges(A))
679 self.assertTrue(self.builds[2].hasChanges(B))
680 self.assertTrue(self.builds[4].hasChanges(A))
681 self.assertFalse(self.builds[4].hasChanges(B))
682 self.assertTrue(self.builds[4].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700683
684 # Finish running all passing jobs for change A
685 self.release(self.builds[1])
686 self.waitUntilSettled()
687 # Fail and report change A
688 self.release(self.builds[0])
689 self.waitUntilSettled()
690
691 # restart of B,C after A failure
Paul Belanger174a8272017-03-14 13:20:10 -0400692 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700693 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400694 self.executor_server.release('.*-merge')
James E. Blairfef71632013-09-23 11:15:47 -0700695 self.waitUntilSettled()
696
697 self.assertEqual(len(self.builds), 4)
698 self.assertEqual(self.builds[0].name, 'project-test1') # B
699 self.assertEqual(self.builds[1].name, 'project-test2') # B
700 self.assertEqual(self.builds[2].name, 'project-test1') # C
701 self.assertEqual(self.builds[3].name, 'project-test2') # C
702
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400703 self.assertFalse(self.builds[1].hasChanges(A))
704 self.assertTrue(self.builds[1].hasChanges(B))
705 self.assertFalse(self.builds[1].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700706
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400707 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blairfef71632013-09-23 11:15:47 -0700708 # After A failed and B and C restarted, B should be back in
709 # C's tests because it has not failed yet.
Paul Belanger71dd2fc2016-11-04 19:05:55 -0400710 self.assertTrue(self.builds[2].hasChanges(B))
711 self.assertTrue(self.builds[2].hasChanges(C))
James E. Blairfef71632013-09-23 11:15:47 -0700712
Paul Belanger174a8272017-03-14 13:20:10 -0400713 self.executor_server.hold_jobs_in_build = False
714 self.executor_server.release()
James E. Blairfef71632013-09-23 11:15:47 -0700715 self.waitUntilSettled()
716
717 self.assertEqual(len(self.builds), 0)
718 self.assertEqual(len(self.history), 21)
719 self.assertEqual(A.data['status'], 'NEW')
720 self.assertEqual(B.data['status'], 'NEW')
721 self.assertEqual(C.data['status'], 'MERGED')
722 self.assertEqual(A.reported, 2)
723 self.assertEqual(B.reported, 2)
724 self.assertEqual(C.reported, 2)
725
James E. Blair8c803f82012-07-31 16:25:42 -0700726 def test_patch_order(self):
727 "Test that dependent patches are tested in the right order"
728 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
729 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
730 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700731 A.addApproval('code-review', 2)
732 B.addApproval('code-review', 2)
733 C.addApproval('code-review', 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700734
735 M2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M2')
736 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
737 M2.setMerged()
738 M1.setMerged()
739
740 # C -> B -> A -> M1 -> M2
741 # M2 is here to make sure it is never queried. If it is, it
742 # means zuul is walking down the entire history of merged
743 # changes.
744
745 C.setDependsOn(B, 1)
746 B.setDependsOn(A, 1)
747 A.setDependsOn(M1, 1)
748 M1.setDependsOn(M2, 1)
749
James E. Blair8b5408c2016-08-08 15:37:46 -0700750 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair8c803f82012-07-31 16:25:42 -0700751
752 self.waitUntilSettled()
753
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400754 self.assertEqual(A.data['status'], 'NEW')
755 self.assertEqual(B.data['status'], 'NEW')
756 self.assertEqual(C.data['status'], 'NEW')
James E. Blair8c803f82012-07-31 16:25:42 -0700757
James E. Blair8b5408c2016-08-08 15:37:46 -0700758 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
759 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair8c803f82012-07-31 16:25:42 -0700760
761 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400762 self.assertEqual(M2.queried, 0)
763 self.assertEqual(A.data['status'], 'MERGED')
764 self.assertEqual(B.data['status'], 'MERGED')
765 self.assertEqual(C.data['status'], 'MERGED')
766 self.assertEqual(A.reported, 2)
767 self.assertEqual(B.reported, 2)
768 self.assertEqual(C.reported, 2)
James E. Blair8c803f82012-07-31 16:25:42 -0700769
James E. Blair063672f2015-01-29 13:09:12 -0800770 def test_needed_changes_enqueue(self):
771 "Test that a needed change is enqueued ahead"
772 # A Given a git tree like this, if we enqueue
773 # / \ change C, we should walk up and down the tree
774 # B G and enqueue changes in the order ABCDEFG.
775 # /|\ This is also the order that you would get if
776 # *C E F you enqueued changes in the order ABCDEFG, so
777 # / the ordering is stable across re-enqueue events.
778 # D
779
780 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
781 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
782 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
783 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
784 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
785 F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F')
786 G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G')
787 B.setDependsOn(A, 1)
788 C.setDependsOn(B, 1)
789 D.setDependsOn(C, 1)
790 E.setDependsOn(B, 1)
791 F.setDependsOn(B, 1)
792 G.setDependsOn(A, 1)
793
James E. Blair8b5408c2016-08-08 15:37:46 -0700794 A.addApproval('code-review', 2)
795 B.addApproval('code-review', 2)
796 C.addApproval('code-review', 2)
797 D.addApproval('code-review', 2)
798 E.addApproval('code-review', 2)
799 F.addApproval('code-review', 2)
800 G.addApproval('code-review', 2)
801 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair063672f2015-01-29 13:09:12 -0800802
803 self.waitUntilSettled()
804
805 self.assertEqual(A.data['status'], 'NEW')
806 self.assertEqual(B.data['status'], 'NEW')
807 self.assertEqual(C.data['status'], 'NEW')
808 self.assertEqual(D.data['status'], 'NEW')
809 self.assertEqual(E.data['status'], 'NEW')
810 self.assertEqual(F.data['status'], 'NEW')
811 self.assertEqual(G.data['status'], 'NEW')
812
813 # We're about to add approvals to changes without adding the
814 # triggering events to Zuul, so that we can be sure that it is
815 # enqueing the changes based on dependencies, not because of
816 # triggering events. Since it will have the changes cached
817 # already (without approvals), we need to clear the cache
818 # first.
Paul Belanger593480a2016-11-02 19:06:28 -0400819 for connection in self.connections.connections.values():
Joshua Hesketh4bd7da32016-02-17 20:58:47 +1100820 connection.maintainCache([])
James E. Blair063672f2015-01-29 13:09:12 -0800821
Paul Belanger174a8272017-03-14 13:20:10 -0400822 self.executor_server.hold_jobs_in_build = True
James E. Blair8b5408c2016-08-08 15:37:46 -0700823 A.addApproval('approved', 1)
824 B.addApproval('approved', 1)
825 D.addApproval('approved', 1)
826 E.addApproval('approved', 1)
827 F.addApproval('approved', 1)
828 G.addApproval('approved', 1)
829 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair063672f2015-01-29 13:09:12 -0800830
831 for x in range(8):
Paul Belanger174a8272017-03-14 13:20:10 -0400832 self.executor_server.release('.*-merge')
James E. Blair063672f2015-01-29 13:09:12 -0800833 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -0400834 self.executor_server.hold_jobs_in_build = False
835 self.executor_server.release()
James E. Blair063672f2015-01-29 13:09:12 -0800836 self.waitUntilSettled()
837
838 self.assertEqual(A.data['status'], 'MERGED')
839 self.assertEqual(B.data['status'], 'MERGED')
840 self.assertEqual(C.data['status'], 'MERGED')
841 self.assertEqual(D.data['status'], 'MERGED')
842 self.assertEqual(E.data['status'], 'MERGED')
843 self.assertEqual(F.data['status'], 'MERGED')
844 self.assertEqual(G.data['status'], 'MERGED')
845 self.assertEqual(A.reported, 2)
846 self.assertEqual(B.reported, 2)
847 self.assertEqual(C.reported, 2)
848 self.assertEqual(D.reported, 2)
849 self.assertEqual(E.reported, 2)
850 self.assertEqual(F.reported, 2)
851 self.assertEqual(G.reported, 2)
852 self.assertEqual(self.history[6].changes,
853 '1,1 2,1 3,1 4,1 5,1 6,1 7,1')
854
Joshua Hesketh850ccb62014-11-27 11:31:02 +1100855 def test_source_cache(self):
856 "Test that the source cache operates correctly"
Paul Belanger174a8272017-03-14 13:20:10 -0400857 self.executor_server.hold_jobs_in_build = True
James E. Blair0e933c52013-07-11 10:18:52 -0700858
859 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
860 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
861 X = self.fake_gerrit.addFakeChange('org/project', 'master', 'X')
James E. Blair8b5408c2016-08-08 15:37:46 -0700862 A.addApproval('code-review', 2)
863 B.addApproval('code-review', 2)
James E. Blair0e933c52013-07-11 10:18:52 -0700864
865 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
866 M1.setMerged()
867
868 B.setDependsOn(A, 1)
869 A.setDependsOn(M1, 1)
870
James E. Blair8b5408c2016-08-08 15:37:46 -0700871 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair0e933c52013-07-11 10:18:52 -0700872 self.fake_gerrit.addEvent(X.getPatchsetCreatedEvent(1))
873
874 self.waitUntilSettled()
875
876 for build in self.builds:
877 if build.parameters['ZUUL_PIPELINE'] == 'check':
878 build.release()
879 self.waitUntilSettled()
880 for build in self.builds:
881 if build.parameters['ZUUL_PIPELINE'] == 'check':
882 build.release()
883 self.waitUntilSettled()
884
James E. Blair8b5408c2016-08-08 15:37:46 -0700885 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair0e933c52013-07-11 10:18:52 -0700886 self.waitUntilSettled()
887
Joshua Hesketh352264b2015-08-11 23:42:08 +1000888 self.log.debug("len %s" % self.fake_gerrit._change_cache.keys())
James E. Blair0e933c52013-07-11 10:18:52 -0700889 # there should still be changes in the cache
Joshua Hesketh352264b2015-08-11 23:42:08 +1000890 self.assertNotEqual(len(self.fake_gerrit._change_cache.keys()), 0)
James E. Blair0e933c52013-07-11 10:18:52 -0700891
Paul Belanger174a8272017-03-14 13:20:10 -0400892 self.executor_server.hold_jobs_in_build = False
893 self.executor_server.release()
James E. Blair0e933c52013-07-11 10:18:52 -0700894 self.waitUntilSettled()
895
896 self.assertEqual(A.data['status'], 'MERGED')
897 self.assertEqual(B.data['status'], 'MERGED')
898 self.assertEqual(A.queried, 2) # Initial and isMerged
899 self.assertEqual(B.queried, 3) # Initial A, refresh from B, isMerged
900
James E. Blair8c803f82012-07-31 16:25:42 -0700901 def test_can_merge(self):
James E. Blair4886cc12012-07-18 15:39:41 -0700902 "Test whether a change is ready to merge"
James E. Blair8c803f82012-07-31 16:25:42 -0700903 # TODO: move to test_gerrit (this is a unit test!)
904 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belanger9bba4902016-11-02 16:07:33 -0400905 tenant = self.sched.abide.tenants.get('tenant-one')
906 source = tenant.layout.pipelines['gate'].source
907
908 # TODO(pabelanger): As we add more source / trigger APIs we should make
909 # it easier for users to create events for testing.
910 event = zuul.model.TriggerEvent()
911 event.trigger_name = 'gerrit'
912 event.change_number = '1'
913 event.patch_number = '2'
914
915 a = source.getChange(event)
916 mgr = tenant.layout.pipelines['gate'].manager
James E. Blairc0dedf82014-08-06 09:37:52 -0700917 self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair8c803f82012-07-31 16:25:42 -0700918
James E. Blair8b5408c2016-08-08 15:37:46 -0700919 A.addApproval('code-review', 2)
Paul Belanger9bba4902016-11-02 16:07:33 -0400920 a = source.getChange(event, refresh=True)
James E. Blairc0dedf82014-08-06 09:37:52 -0700921 self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair8c803f82012-07-31 16:25:42 -0700922
James E. Blair8b5408c2016-08-08 15:37:46 -0700923 A.addApproval('approved', 1)
Paul Belanger9bba4902016-11-02 16:07:33 -0400924 a = source.getChange(event, refresh=True)
James E. Blairc0dedf82014-08-06 09:37:52 -0700925 self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds()))
James E. Blair4886cc12012-07-18 15:39:41 -0700926
James E. Blairec056492016-07-22 09:45:56 -0700927 @skip("Disabled for early v3 development")
James E. Blair973721f2012-08-15 10:19:43 -0700928 def test_build_configuration_conflict(self):
929 "Test that merge conflicts are handled"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700930
931 self.gearman_server.hold_jobs_in_queue = True
James E. Blair6736beb2013-07-11 15:18:15 -0700932 A = self.fake_gerrit.addFakeChange('org/conflict-project',
933 'master', 'A')
James E. Blair973721f2012-08-15 10:19:43 -0700934 A.addPatchset(['conflict'])
James E. Blair6736beb2013-07-11 15:18:15 -0700935 B = self.fake_gerrit.addFakeChange('org/conflict-project',
936 'master', 'B')
James E. Blair973721f2012-08-15 10:19:43 -0700937 B.addPatchset(['conflict'])
James E. Blair6736beb2013-07-11 15:18:15 -0700938 C = self.fake_gerrit.addFakeChange('org/conflict-project',
939 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -0700940 A.addApproval('code-review', 2)
941 B.addApproval('code-review', 2)
942 C.addApproval('code-review', 2)
943 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
944 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
945 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair973721f2012-08-15 10:19:43 -0700946 self.waitUntilSettled()
947
James E. Blair6736beb2013-07-11 15:18:15 -0700948 self.assertEqual(A.reported, 1)
949 self.assertEqual(B.reported, 1)
950 self.assertEqual(C.reported, 1)
951
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700952 self.gearman_server.release('.*-merge')
James E. Blair973721f2012-08-15 10:19:43 -0700953 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700954 self.gearman_server.release('.*-merge')
James E. Blair973721f2012-08-15 10:19:43 -0700955 self.waitUntilSettled()
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700956 self.gearman_server.release('.*-merge')
James E. Blair973721f2012-08-15 10:19:43 -0700957 self.waitUntilSettled()
James E. Blair972e3c72013-08-29 12:04:55 -0700958
959 self.assertEqual(len(self.history), 2) # A and C merge jobs
960
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700961 self.gearman_server.hold_jobs_in_queue = False
962 self.gearman_server.release()
James E. Blair973721f2012-08-15 10:19:43 -0700963 self.waitUntilSettled()
964
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400965 self.assertEqual(A.data['status'], 'MERGED')
966 self.assertEqual(B.data['status'], 'NEW')
967 self.assertEqual(C.data['status'], 'MERGED')
968 self.assertEqual(A.reported, 2)
969 self.assertEqual(B.reported, 2)
970 self.assertEqual(C.reported, 2)
James E. Blair972e3c72013-08-29 12:04:55 -0700971 self.assertEqual(len(self.history), 6)
James E. Blair6736beb2013-07-11 15:18:15 -0700972
James E. Blairdaabed22012-08-15 15:38:57 -0700973 def test_post(self):
974 "Test that post jobs run"
James E. Blair1f4c2bb2013-04-26 08:40:46 -0700975
Zhongyue Luo5d556072012-09-21 02:00:47 +0900976 e = {
977 "type": "ref-updated",
978 "submitter": {
979 "name": "User Name",
980 },
981 "refUpdate": {
982 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
983 "newRev": "d479a0bfcb34da57a31adb2a595c0cf687812543",
984 "refName": "master",
985 "project": "org/project",
986 }
987 }
James E. Blairdaabed22012-08-15 15:38:57 -0700988 self.fake_gerrit.addEvent(e)
989 self.waitUntilSettled()
990
Monty Taylor6bef8ef2013-06-02 08:17:12 -0400991 job_names = [x.name for x in self.history]
Monty Taylor98f0f3e2013-07-06 16:02:31 -0400992 self.assertEqual(len(self.history), 1)
993 self.assertIn('project-post', job_names)
James E. Blairc6294a52012-08-17 10:19:48 -0700994
K Jonathan Harkerf95e7232015-04-29 13:33:16 -0700995 def test_post_ignore_deletes(self):
996 "Test that deleting refs does not trigger post jobs"
997
998 e = {
999 "type": "ref-updated",
1000 "submitter": {
1001 "name": "User Name",
1002 },
1003 "refUpdate": {
1004 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
1005 "newRev": "0000000000000000000000000000000000000000",
1006 "refName": "master",
1007 "project": "org/project",
1008 }
1009 }
1010 self.fake_gerrit.addEvent(e)
1011 self.waitUntilSettled()
1012
1013 job_names = [x.name for x in self.history]
1014 self.assertEqual(len(self.history), 0)
1015 self.assertNotIn('project-post', job_names)
1016
1017 def test_post_ignore_deletes_negative(self):
1018 "Test that deleting refs does trigger post jobs"
1019
Adam Gandelmanc5e4f1d2016-11-29 14:27:17 -08001020 self.updateConfigLayout('layout-dont-ignore-ref-deletes')
K Jonathan Harkerf95e7232015-04-29 13:33:16 -07001021 self.sched.reconfigure(self.config)
1022
1023 e = {
1024 "type": "ref-updated",
1025 "submitter": {
1026 "name": "User Name",
1027 },
1028 "refUpdate": {
1029 "oldRev": "90f173846e3af9154517b88543ffbd1691f31366",
1030 "newRev": "0000000000000000000000000000000000000000",
1031 "refName": "master",
1032 "project": "org/project",
1033 }
1034 }
1035 self.fake_gerrit.addEvent(e)
1036 self.waitUntilSettled()
1037
1038 job_names = [x.name for x in self.history]
1039 self.assertEqual(len(self.history), 1)
1040 self.assertIn('project-post', job_names)
1041
James E. Blairec056492016-07-22 09:45:56 -07001042 @skip("Disabled for early v3 development")
James E. Blairc6294a52012-08-17 10:19:48 -07001043 def test_build_configuration_branch_interaction(self):
1044 "Test that switching between branches works"
1045 self.test_build_configuration()
1046 self.test_build_configuration_branch()
1047 # C has been merged, undo that
Monty Taylorbc758832013-06-17 17:22:42 -04001048 path = os.path.join(self.upstream_root, "org/project")
James E. Blairc6294a52012-08-17 10:19:48 -07001049 repo = git.Repo(path)
1050 repo.heads.master.commit = repo.commit('init')
1051 self.test_build_configuration()
1052
James E. Blaircaec0c52012-08-22 14:52:22 -07001053 def test_dependent_changes_dequeue(self):
1054 "Test that dependent patches are not needlessly tested"
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001055
James E. Blaircaec0c52012-08-22 14:52:22 -07001056 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1057 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1058 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -07001059 A.addApproval('code-review', 2)
1060 B.addApproval('code-review', 2)
1061 C.addApproval('code-review', 2)
James E. Blaircaec0c52012-08-22 14:52:22 -07001062
1063 M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1')
1064 M1.setMerged()
1065
1066 # C -> B -> A -> M1
1067
1068 C.setDependsOn(B, 1)
1069 B.setDependsOn(A, 1)
1070 A.setDependsOn(M1, 1)
1071
Paul Belanger174a8272017-03-14 13:20:10 -04001072 self.executor_server.failJob('project-merge', A)
James E. Blaircaec0c52012-08-22 14:52:22 -07001073
James E. Blair8b5408c2016-08-08 15:37:46 -07001074 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1075 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1076 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blaircaec0c52012-08-22 14:52:22 -07001077
1078 self.waitUntilSettled()
1079
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001080 self.assertEqual(A.data['status'], 'NEW')
1081 self.assertEqual(A.reported, 2)
1082 self.assertEqual(B.data['status'], 'NEW')
1083 self.assertEqual(B.reported, 2)
1084 self.assertEqual(C.data['status'], 'NEW')
1085 self.assertEqual(C.reported, 2)
1086 self.assertEqual(len(self.history), 1)
James E. Blairec590122012-08-22 15:19:31 -07001087
James E. Blair972e3c72013-08-29 12:04:55 -07001088 def test_failing_dependent_changes(self):
1089 "Test that failing dependent patches are taken out of stream"
Paul Belanger174a8272017-03-14 13:20:10 -04001090 self.executor_server.hold_jobs_in_build = True
James E. Blair972e3c72013-08-29 12:04:55 -07001091 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1092 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1093 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1094 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
1095 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
James E. Blair8b5408c2016-08-08 15:37:46 -07001096 A.addApproval('code-review', 2)
1097 B.addApproval('code-review', 2)
1098 C.addApproval('code-review', 2)
1099 D.addApproval('code-review', 2)
1100 E.addApproval('code-review', 2)
James E. Blair972e3c72013-08-29 12:04:55 -07001101
1102 # E, D -> C -> B, A
1103
1104 D.setDependsOn(C, 1)
1105 C.setDependsOn(B, 1)
1106
Paul Belanger174a8272017-03-14 13:20:10 -04001107 self.executor_server.failJob('project-test1', B)
James E. Blair972e3c72013-08-29 12:04:55 -07001108
James E. Blair8b5408c2016-08-08 15:37:46 -07001109 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
1110 self.fake_gerrit.addEvent(D.addApproval('approved', 1))
1111 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1112 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1113 self.fake_gerrit.addEvent(E.addApproval('approved', 1))
James E. Blair972e3c72013-08-29 12:04:55 -07001114
1115 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001116 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001117 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001118 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001119 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001120 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001121 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001122 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001123 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001124 self.executor_server.release('.*-merge')
James E. Blair972e3c72013-08-29 12:04:55 -07001125 self.waitUntilSettled()
1126
Paul Belanger174a8272017-03-14 13:20:10 -04001127 self.executor_server.hold_jobs_in_build = False
James E. Blair972e3c72013-08-29 12:04:55 -07001128 for build in self.builds:
1129 if build.parameters['ZUUL_CHANGE'] != '1':
1130 build.release()
1131 self.waitUntilSettled()
1132
Paul Belanger174a8272017-03-14 13:20:10 -04001133 self.executor_server.release()
James E. Blair972e3c72013-08-29 12:04:55 -07001134 self.waitUntilSettled()
1135
1136 self.assertEqual(A.data['status'], 'MERGED')
1137 self.assertEqual(A.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001138 self.assertIn('Build succeeded', A.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001139 self.assertEqual(B.data['status'], 'NEW')
1140 self.assertEqual(B.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001141 self.assertIn('Build failed', B.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001142 self.assertEqual(C.data['status'], 'NEW')
1143 self.assertEqual(C.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001144 self.assertIn('depends on a change', C.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001145 self.assertEqual(D.data['status'], 'NEW')
1146 self.assertEqual(D.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001147 self.assertIn('depends on a change', D.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001148 self.assertEqual(E.data['status'], 'MERGED')
1149 self.assertEqual(E.reported, 2)
Jeremy Stanley10837132014-08-02 16:10:56 +00001150 self.assertIn('Build succeeded', E.messages[1])
James E. Blair972e3c72013-08-29 12:04:55 -07001151 self.assertEqual(len(self.history), 18)
1152
James E. Blairec590122012-08-22 15:19:31 -07001153 def test_head_is_dequeued_once(self):
James E. Blair2fa50962013-01-30 21:50:41 -08001154 "Test that if a change at the head fails it is dequeued only once"
James E. Blairec590122012-08-22 15:19:31 -07001155 # If it's dequeued more than once, we should see extra
1156 # aborted jobs.
James E. Blairec590122012-08-22 15:19:31 -07001157
Paul Belanger174a8272017-03-14 13:20:10 -04001158 self.executor_server.hold_jobs_in_build = True
James E. Blairec590122012-08-22 15:19:31 -07001159 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
1160 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
1161 C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -07001162 A.addApproval('code-review', 2)
1163 B.addApproval('code-review', 2)
1164 C.addApproval('code-review', 2)
James E. Blairec590122012-08-22 15:19:31 -07001165
Paul Belanger174a8272017-03-14 13:20:10 -04001166 self.executor_server.failJob('project-test1', A)
1167 self.executor_server.failJob('project-test2', A)
1168 self.executor_server.failJob('project1-project2-integration', A)
James E. Blairec590122012-08-22 15:19:31 -07001169
James E. Blair8b5408c2016-08-08 15:37:46 -07001170 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
1171 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1172 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blairec590122012-08-22 15:19:31 -07001173
1174 self.waitUntilSettled()
James E. Blairec590122012-08-22 15:19:31 -07001175
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001176 self.assertEqual(len(self.builds), 1)
Paul Belanger58bf6912016-11-11 19:36:01 -05001177 self.assertEqual(self.builds[0].name, 'project-merge')
1178 self.assertTrue(self.builds[0].hasChanges(A))
James E. Blairec590122012-08-22 15:19:31 -07001179
Paul Belanger174a8272017-03-14 13:20:10 -04001180 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001181 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001182 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001183 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001184 self.executor_server.release('.*-merge')
James E. Blairec590122012-08-22 15:19:31 -07001185 self.waitUntilSettled()
1186
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001187 self.assertEqual(len(self.builds), 9)
Paul Belanger58bf6912016-11-11 19:36:01 -05001188 self.assertEqual(self.builds[0].name, 'project-test1')
1189 self.assertEqual(self.builds[1].name, 'project-test2')
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001190 self.assertEqual(self.builds[2].name, 'project1-project2-integration')
Paul Belanger58bf6912016-11-11 19:36:01 -05001191 self.assertEqual(self.builds[3].name, 'project-test1')
1192 self.assertEqual(self.builds[4].name, 'project-test2')
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001193 self.assertEqual(self.builds[5].name, 'project1-project2-integration')
Paul Belanger58bf6912016-11-11 19:36:01 -05001194 self.assertEqual(self.builds[6].name, 'project-test1')
1195 self.assertEqual(self.builds[7].name, 'project-test2')
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001196 self.assertEqual(self.builds[8].name, 'project1-project2-integration')
James E. Blairec590122012-08-22 15:19:31 -07001197
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001198 self.release(self.builds[0])
James E. Blairec590122012-08-22 15:19:31 -07001199 self.waitUntilSettled()
1200
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001201 self.assertEqual(len(self.builds), 3) # test2,integration, merge for B
1202 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 6)
James E. Blairec590122012-08-22 15:19:31 -07001203
Paul Belanger174a8272017-03-14 13:20:10 -04001204 self.executor_server.hold_jobs_in_build = False
1205 self.executor_server.release()
James E. Blairec590122012-08-22 15:19:31 -07001206 self.waitUntilSettled()
1207
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001208 self.assertEqual(len(self.builds), 0)
1209 self.assertEqual(len(self.history), 20)
James E. Blaircaec0c52012-08-22 14:52:22 -07001210
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001211 self.assertEqual(A.data['status'], 'NEW')
1212 self.assertEqual(B.data['status'], 'MERGED')
1213 self.assertEqual(C.data['status'], 'MERGED')
1214 self.assertEqual(A.reported, 2)
1215 self.assertEqual(B.reported, 2)
1216 self.assertEqual(C.reported, 2)
James E. Blair4ec821f2012-08-23 15:28:28 -07001217
1218 def test_nonvoting_job(self):
1219 "Test that non-voting jobs don't vote."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001220
James E. Blair4ec821f2012-08-23 15:28:28 -07001221 A = self.fake_gerrit.addFakeChange('org/nonvoting-project',
1222 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001223 A.addApproval('code-review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04001224 self.executor_server.failJob('nonvoting-project-test2', A)
James E. Blair8b5408c2016-08-08 15:37:46 -07001225 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair4ec821f2012-08-23 15:28:28 -07001226
1227 self.waitUntilSettled()
James E. Blair4ec821f2012-08-23 15:28:28 -07001228
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001229 self.assertEqual(A.data['status'], 'MERGED')
1230 self.assertEqual(A.reported, 2)
1231 self.assertEqual(
1232 self.getJobFromHistory('nonvoting-project-merge').result,
1233 'SUCCESS')
1234 self.assertEqual(
1235 self.getJobFromHistory('nonvoting-project-test1').result,
1236 'SUCCESS')
1237 self.assertEqual(
1238 self.getJobFromHistory('nonvoting-project-test2').result,
1239 'FAILURE')
James E. Blaire0487072012-08-29 17:38:31 -07001240
James E. Blair5821bd92015-09-16 08:48:15 -07001241 for build in self.builds:
1242 self.assertEqual(build.parameters['ZUUL_VOTING'], '0')
1243
James E. Blaire0487072012-08-29 17:38:31 -07001244 def test_check_queue_success(self):
1245 "Test successful check queue jobs."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001246
James E. Blaire0487072012-08-29 17:38:31 -07001247 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1248 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1249
1250 self.waitUntilSettled()
James E. Blaire0487072012-08-29 17:38:31 -07001251
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001252 self.assertEqual(A.data['status'], 'NEW')
1253 self.assertEqual(A.reported, 1)
1254 self.assertEqual(self.getJobFromHistory('project-merge').result,
1255 'SUCCESS')
1256 self.assertEqual(self.getJobFromHistory('project-test1').result,
1257 'SUCCESS')
1258 self.assertEqual(self.getJobFromHistory('project-test2').result,
1259 'SUCCESS')
James E. Blaire0487072012-08-29 17:38:31 -07001260
1261 def test_check_queue_failure(self):
1262 "Test failed check queue jobs."
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001263
James E. Blaire0487072012-08-29 17:38:31 -07001264 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belanger174a8272017-03-14 13:20:10 -04001265 self.executor_server.failJob('project-test2', A)
James E. Blaire0487072012-08-29 17:38:31 -07001266 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1267
1268 self.waitUntilSettled()
James E. Blaire0487072012-08-29 17:38:31 -07001269
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001270 self.assertEqual(A.data['status'], 'NEW')
1271 self.assertEqual(A.reported, 1)
1272 self.assertEqual(self.getJobFromHistory('project-merge').result,
James E. Blair78e31b32013-07-09 09:11:34 -07001273 'SUCCESS')
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001274 self.assertEqual(self.getJobFromHistory('project-test1').result,
1275 'SUCCESS')
1276 self.assertEqual(self.getJobFromHistory('project-test2').result,
1277 'FAILURE')
James E. Blair127bc182012-08-28 15:55:15 -07001278
1279 def test_dependent_behind_dequeue(self):
Clint Byruma9626572017-02-22 14:04:00 -05001280 # This particular test does a large amount of merges and needs a little
1281 # more time to complete
1282 self.wait_timeout = 90
James E. Blair127bc182012-08-28 15:55:15 -07001283 "test that dependent changes behind dequeued changes work"
1284 # This complicated test is a reproduction of a real life bug
1285 self.sched.reconfigure(self.config)
James E. Blair127bc182012-08-28 15:55:15 -07001286
Paul Belanger174a8272017-03-14 13:20:10 -04001287 self.executor_server.hold_jobs_in_build = True
James E. Blair127bc182012-08-28 15:55:15 -07001288 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
1289 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
1290 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
1291 D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D')
1292 E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E')
1293 F = self.fake_gerrit.addFakeChange('org/project3', 'master', 'F')
1294 D.setDependsOn(C, 1)
1295 E.setDependsOn(D, 1)
James E. Blair8b5408c2016-08-08 15:37:46 -07001296 A.addApproval('code-review', 2)
1297 B.addApproval('code-review', 2)
1298 C.addApproval('code-review', 2)
1299 D.addApproval('code-review', 2)
1300 E.addApproval('code-review', 2)
1301 F.addApproval('code-review', 2)
James E. Blair127bc182012-08-28 15:55:15 -07001302
1303 A.fail_merge = True
James E. Blair127bc182012-08-28 15:55:15 -07001304
1305 # Change object re-use in the gerrit trigger is hidden if
1306 # changes are added in quick succession; waiting makes it more
1307 # like real life.
James E. Blair8b5408c2016-08-08 15:37:46 -07001308 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001309 self.waitUntilSettled()
James E. Blair8b5408c2016-08-08 15:37:46 -07001310 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001311 self.waitUntilSettled()
1312
Paul Belanger174a8272017-03-14 13:20:10 -04001313 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001314 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001315 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001316 self.waitUntilSettled()
1317
James E. Blair8b5408c2016-08-08 15:37:46 -07001318 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001319 self.waitUntilSettled()
James E. Blair8b5408c2016-08-08 15:37:46 -07001320 self.fake_gerrit.addEvent(D.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001321 self.waitUntilSettled()
James E. Blair8b5408c2016-08-08 15:37:46 -07001322 self.fake_gerrit.addEvent(E.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001323 self.waitUntilSettled()
James E. Blair8b5408c2016-08-08 15:37:46 -07001324 self.fake_gerrit.addEvent(F.addApproval('approved', 1))
James E. Blair127bc182012-08-28 15:55:15 -07001325 self.waitUntilSettled()
1326
Paul Belanger174a8272017-03-14 13:20:10 -04001327 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001328 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001329 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001330 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001331 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001332 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001333 self.executor_server.release('.*-merge')
James E. Blair127bc182012-08-28 15:55:15 -07001334 self.waitUntilSettled()
1335
1336 # all jobs running
James E. Blaire955e062012-10-08 09:49:03 -07001337
1338 # Grab pointers to the jobs we want to release before
1339 # releasing any, because list indexes may change as
1340 # the jobs complete.
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001341 a, b, c = self.builds[:3]
James E. Blaire955e062012-10-08 09:49:03 -07001342 a.release()
1343 b.release()
1344 c.release()
James E. Blair127bc182012-08-28 15:55:15 -07001345 self.waitUntilSettled()
1346
Paul Belanger174a8272017-03-14 13:20:10 -04001347 self.executor_server.hold_jobs_in_build = False
1348 self.executor_server.release()
James E. Blair127bc182012-08-28 15:55:15 -07001349 self.waitUntilSettled()
1350
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001351 self.assertEqual(A.data['status'], 'NEW')
1352 self.assertEqual(B.data['status'], 'MERGED')
1353 self.assertEqual(C.data['status'], 'MERGED')
1354 self.assertEqual(D.data['status'], 'MERGED')
1355 self.assertEqual(E.data['status'], 'MERGED')
1356 self.assertEqual(F.data['status'], 'MERGED')
James E. Blair127bc182012-08-28 15:55:15 -07001357
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001358 self.assertEqual(A.reported, 2)
1359 self.assertEqual(B.reported, 2)
1360 self.assertEqual(C.reported, 2)
1361 self.assertEqual(D.reported, 2)
1362 self.assertEqual(E.reported, 2)
1363 self.assertEqual(F.reported, 2)
James E. Blair127bc182012-08-28 15:55:15 -07001364
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001365 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 15)
1366 self.assertEqual(len(self.history), 44)
James E. Blair05fed602012-09-07 12:45:24 -07001367
1368 def test_merger_repack(self):
1369 "Test that the merger works after a repack"
James E. Blair1f4c2bb2013-04-26 08:40:46 -07001370
James E. Blair05fed602012-09-07 12:45:24 -07001371 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001372 A.addApproval('code-review', 2)
1373 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair05fed602012-09-07 12:45:24 -07001374 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001375 self.assertEqual(self.getJobFromHistory('project-merge').result,
1376 'SUCCESS')
1377 self.assertEqual(self.getJobFromHistory('project-test1').result,
1378 'SUCCESS')
1379 self.assertEqual(self.getJobFromHistory('project-test2').result,
1380 'SUCCESS')
1381 self.assertEqual(A.data['status'], 'MERGED')
1382 self.assertEqual(A.reported, 2)
James E. Blair05fed602012-09-07 12:45:24 -07001383 self.assertEmptyQueues()
Paul Belanger5bfe9e72016-11-04 19:20:04 -04001384 self.build_history = []
James E. Blair05fed602012-09-07 12:45:24 -07001385
Monty Taylord642d852017-02-23 14:05:42 -05001386 path = os.path.join(self.merger_src_root, "org/project")
James E. Blair8c1be532017-02-07 14:04:12 -08001387 if os.path.exists(path):
1388 repack_repo(path)
Paul Belanger174a8272017-03-14 13:20:10 -04001389 path = os.path.join(self.executor_src_root, "org/project")
James E. Blair8c1be532017-02-07 14:04:12 -08001390 if os.path.exists(path):
1391 repack_repo(path)
James E. Blair05fed602012-09-07 12:45:24 -07001392
1393 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001394 A.addApproval('code-review', 2)
1395 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair05fed602012-09-07 12:45:24 -07001396 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001397 self.assertEqual(self.getJobFromHistory('project-merge').result,
1398 'SUCCESS')
1399 self.assertEqual(self.getJobFromHistory('project-test1').result,
1400 'SUCCESS')
1401 self.assertEqual(self.getJobFromHistory('project-test2').result,
1402 'SUCCESS')
1403 self.assertEqual(A.data['status'], 'MERGED')
1404 self.assertEqual(A.reported, 2)
James E. Blair7ee88a22012-09-12 18:59:31 +02001405
James E. Blair4886f282012-11-15 09:27:33 -08001406 def test_merger_repack_large_change(self):
1407 "Test that the merger works with large changes after a repack"
Paul Belanger174a8272017-03-14 13:20:10 -04001408 # https://bugs.executepad.net/zuul/+bug/1078946
James E. Blairac2c3242014-01-24 13:38:51 -08001409 # This test assumes the repo is already cloned; make sure it is
Paul Belanger503bded2016-11-11 19:43:38 -05001410 tenant = self.sched.abide.tenants.get('tenant-one')
Joshua Hesketh352264b2015-08-11 23:42:08 +10001411 url = self.fake_gerrit.getGitUrl(
Paul Belanger503bded2016-11-11 19:43:38 -05001412 tenant.layout.project_configs.get('org/project1'))
James E. Blair4076e2b2014-01-28 12:42:20 -08001413 self.merge_server.merger.addProject('org/project1', url)
James E. Blair4886f282012-11-15 09:27:33 -08001414 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
1415 A.addPatchset(large=True)
Monty Taylorbc758832013-06-17 17:22:42 -04001416 path = os.path.join(self.upstream_root, "org/project1")
James E. Blair8c1be532017-02-07 14:04:12 -08001417 repack_repo(path)
Monty Taylord642d852017-02-23 14:05:42 -05001418 path = os.path.join(self.merger_src_root, "org/project1")
James E. Blair8c1be532017-02-07 14:04:12 -08001419 if os.path.exists(path):
1420 repack_repo(path)
Paul Belanger174a8272017-03-14 13:20:10 -04001421 path = os.path.join(self.executor_src_root, "org/project1")
James E. Blair8c1be532017-02-07 14:04:12 -08001422 if os.path.exists(path):
1423 repack_repo(path)
James E. Blair4886f282012-11-15 09:27:33 -08001424
James E. Blair8b5408c2016-08-08 15:37:46 -07001425 A.addApproval('code-review', 2)
1426 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair4886f282012-11-15 09:27:33 -08001427 self.waitUntilSettled()
Paul Belanger503bded2016-11-11 19:43:38 -05001428 self.assertEqual(self.getJobFromHistory('project-merge').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001429 'SUCCESS')
Paul Belanger503bded2016-11-11 19:43:38 -05001430 self.assertEqual(self.getJobFromHistory('project-test1').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001431 'SUCCESS')
Paul Belanger503bded2016-11-11 19:43:38 -05001432 self.assertEqual(self.getJobFromHistory('project-test2').result,
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001433 'SUCCESS')
1434 self.assertEqual(A.data['status'], 'MERGED')
1435 self.assertEqual(A.reported, 2)
James E. Blair4886f282012-11-15 09:27:33 -08001436
James E. Blair2fa50962013-01-30 21:50:41 -08001437 def test_new_patchset_dequeues_old(self):
1438 "Test that a new patchset causes the old to be dequeued"
1439 # D -> C (depends on B) -> B (depends on A) -> A -> M
Paul Belanger174a8272017-03-14 13:20:10 -04001440 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08001441 M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M')
1442 M.setMerged()
1443
1444 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1445 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1446 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1447 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
James E. Blair8b5408c2016-08-08 15:37:46 -07001448 A.addApproval('code-review', 2)
1449 B.addApproval('code-review', 2)
1450 C.addApproval('code-review', 2)
1451 D.addApproval('code-review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08001452
1453 C.setDependsOn(B, 1)
1454 B.setDependsOn(A, 1)
1455 A.setDependsOn(M, 1)
1456
James E. Blair8b5408c2016-08-08 15:37:46 -07001457 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
1458 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1459 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1460 self.fake_gerrit.addEvent(D.addApproval('approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08001461 self.waitUntilSettled()
1462
1463 B.addPatchset()
1464 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1465 self.waitUntilSettled()
1466
Paul Belanger174a8272017-03-14 13:20:10 -04001467 self.executor_server.hold_jobs_in_build = False
1468 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08001469 self.waitUntilSettled()
1470
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001471 self.assertEqual(A.data['status'], 'MERGED')
1472 self.assertEqual(A.reported, 2)
1473 self.assertEqual(B.data['status'], 'NEW')
1474 self.assertEqual(B.reported, 2)
1475 self.assertEqual(C.data['status'], 'NEW')
1476 self.assertEqual(C.reported, 2)
1477 self.assertEqual(D.data['status'], 'MERGED')
1478 self.assertEqual(D.reported, 2)
1479 self.assertEqual(len(self.history), 9) # 3 each for A, B, D.
James E. Blair2fa50962013-01-30 21:50:41 -08001480
James E. Blairba437362015-02-07 11:41:52 -08001481 def test_new_patchset_check(self):
1482 "Test a new patchset in check"
Antoine Mussobd86a312014-01-08 14:51:33 +01001483
Paul Belanger174a8272017-03-14 13:20:10 -04001484 self.executor_server.hold_jobs_in_build = True
Antoine Mussobd86a312014-01-08 14:51:33 +01001485
1486 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blairba437362015-02-07 11:41:52 -08001487 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger18e5f632016-11-03 15:24:16 -04001488 tenant = self.sched.abide.tenants.get('tenant-one')
1489 check_pipeline = tenant.layout.pipelines['check']
James E. Blairba437362015-02-07 11:41:52 -08001490
1491 # Add two git-dependent changes
1492 B.setDependsOn(A, 1)
1493 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1494 self.waitUntilSettled()
Antoine Mussobd86a312014-01-08 14:51:33 +01001495 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1496 self.waitUntilSettled()
James E. Blairba437362015-02-07 11:41:52 -08001497
1498 # A live item, and a non-live/live pair
1499 items = check_pipeline.getAllItems()
1500 self.assertEqual(len(items), 3)
1501
1502 self.assertEqual(items[0].change.number, '1')
1503 self.assertEqual(items[0].change.patchset, '1')
1504 self.assertFalse(items[0].live)
1505
1506 self.assertEqual(items[1].change.number, '2')
1507 self.assertEqual(items[1].change.patchset, '1')
1508 self.assertTrue(items[1].live)
1509
1510 self.assertEqual(items[2].change.number, '1')
1511 self.assertEqual(items[2].change.patchset, '1')
1512 self.assertTrue(items[2].live)
1513
1514 # Add a new patchset to A
1515 A.addPatchset()
1516 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
1517 self.waitUntilSettled()
1518
1519 # The live copy of A,1 should be gone, but the non-live and B
1520 # should continue, and we should have a new A,2
1521 items = check_pipeline.getAllItems()
1522 self.assertEqual(len(items), 3)
1523
1524 self.assertEqual(items[0].change.number, '1')
1525 self.assertEqual(items[0].change.patchset, '1')
1526 self.assertFalse(items[0].live)
1527
1528 self.assertEqual(items[1].change.number, '2')
1529 self.assertEqual(items[1].change.patchset, '1')
1530 self.assertTrue(items[1].live)
1531
1532 self.assertEqual(items[2].change.number, '1')
1533 self.assertEqual(items[2].change.patchset, '2')
1534 self.assertTrue(items[2].live)
1535
1536 # Add a new patchset to B
1537 B.addPatchset()
1538 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1539 self.waitUntilSettled()
1540
1541 # The live copy of B,1 should be gone, and it's non-live copy of A,1
1542 # but we should have a new B,2 (still based on A,1)
1543 items = check_pipeline.getAllItems()
1544 self.assertEqual(len(items), 3)
1545
1546 self.assertEqual(items[0].change.number, '1')
1547 self.assertEqual(items[0].change.patchset, '2')
1548 self.assertTrue(items[0].live)
1549
1550 self.assertEqual(items[1].change.number, '1')
1551 self.assertEqual(items[1].change.patchset, '1')
1552 self.assertFalse(items[1].live)
1553
1554 self.assertEqual(items[2].change.number, '2')
1555 self.assertEqual(items[2].change.patchset, '2')
1556 self.assertTrue(items[2].live)
1557
1558 self.builds[0].release()
1559 self.waitUntilSettled()
1560 self.builds[0].release()
1561 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001562 self.executor_server.hold_jobs_in_build = False
1563 self.executor_server.release()
James E. Blairba437362015-02-07 11:41:52 -08001564 self.waitUntilSettled()
1565
1566 self.assertEqual(A.reported, 1)
1567 self.assertEqual(B.reported, 1)
1568 self.assertEqual(self.history[0].result, 'ABORTED')
1569 self.assertEqual(self.history[0].changes, '1,1')
1570 self.assertEqual(self.history[1].result, 'ABORTED')
1571 self.assertEqual(self.history[1].changes, '1,1 2,1')
1572 self.assertEqual(self.history[2].result, 'SUCCESS')
1573 self.assertEqual(self.history[2].changes, '1,2')
1574 self.assertEqual(self.history[3].result, 'SUCCESS')
1575 self.assertEqual(self.history[3].changes, '1,1 2,2')
1576
1577 def test_abandoned_gate(self):
1578 "Test that an abandoned change is dequeued from gate"
1579
Paul Belanger174a8272017-03-14 13:20:10 -04001580 self.executor_server.hold_jobs_in_build = True
James E. Blairba437362015-02-07 11:41:52 -08001581
1582 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001583 A.addApproval('code-review', 2)
1584 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blairba437362015-02-07 11:41:52 -08001585 self.waitUntilSettled()
Antoine Mussobd86a312014-01-08 14:51:33 +01001586 self.assertEqual(len(self.builds), 1, "One job being built (on hold)")
1587 self.assertEqual(self.builds[0].name, 'project-merge')
1588
1589 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
1590 self.waitUntilSettled()
1591
Paul Belanger174a8272017-03-14 13:20:10 -04001592 self.executor_server.release('.*-merge')
Antoine Mussobd86a312014-01-08 14:51:33 +01001593 self.waitUntilSettled()
1594
Arie5b4048c2016-10-05 16:12:06 +03001595 self.assertBuilds([])
1596 self.assertHistory([
1597 dict(name='project-merge', result='ABORTED', changes='1,1')],
1598 ordered=False)
James E. Blairba437362015-02-07 11:41:52 -08001599 self.assertEqual(A.reported, 1,
1600 "Abandoned gate change should report only start")
1601
1602 def test_abandoned_check(self):
1603 "Test that an abandoned change is dequeued from check"
1604
Paul Belanger174a8272017-03-14 13:20:10 -04001605 self.executor_server.hold_jobs_in_build = True
James E. Blairba437362015-02-07 11:41:52 -08001606
1607 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1608 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger18e5f632016-11-03 15:24:16 -04001609 tenant = self.sched.abide.tenants.get('tenant-one')
1610 check_pipeline = tenant.layout.pipelines['check']
James E. Blairba437362015-02-07 11:41:52 -08001611
1612 # Add two git-dependent changes
1613 B.setDependsOn(A, 1)
1614 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1615 self.waitUntilSettled()
1616 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1617 self.waitUntilSettled()
1618 # A live item, and a non-live/live pair
1619 items = check_pipeline.getAllItems()
1620 self.assertEqual(len(items), 3)
1621
1622 self.assertEqual(items[0].change.number, '1')
1623 self.assertFalse(items[0].live)
1624
1625 self.assertEqual(items[1].change.number, '2')
1626 self.assertTrue(items[1].live)
1627
1628 self.assertEqual(items[2].change.number, '1')
1629 self.assertTrue(items[2].live)
1630
1631 # Abandon A
1632 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
1633 self.waitUntilSettled()
1634
1635 # The live copy of A should be gone, but the non-live and B
1636 # should continue
1637 items = check_pipeline.getAllItems()
1638 self.assertEqual(len(items), 2)
1639
1640 self.assertEqual(items[0].change.number, '1')
1641 self.assertFalse(items[0].live)
1642
1643 self.assertEqual(items[1].change.number, '2')
1644 self.assertTrue(items[1].live)
1645
Paul Belanger174a8272017-03-14 13:20:10 -04001646 self.executor_server.hold_jobs_in_build = False
1647 self.executor_server.release()
James E. Blairba437362015-02-07 11:41:52 -08001648 self.waitUntilSettled()
1649
1650 self.assertEqual(len(self.history), 4)
1651 self.assertEqual(self.history[0].result, 'ABORTED',
Antoine Mussobd86a312014-01-08 14:51:33 +01001652 'Build should have been aborted')
1653 self.assertEqual(A.reported, 0, "Abandoned change should not report")
James E. Blairba437362015-02-07 11:41:52 -08001654 self.assertEqual(B.reported, 1, "Change should report")
Antoine Mussobd86a312014-01-08 14:51:33 +01001655
Steve Varnau7b78b312015-04-03 14:49:46 -07001656 def test_abandoned_not_timer(self):
1657 "Test that an abandoned change does not cancel timer jobs"
1658
Paul Belanger174a8272017-03-14 13:20:10 -04001659 self.executor_server.hold_jobs_in_build = True
Steve Varnau7b78b312015-04-03 14:49:46 -07001660
1661 # Start timer trigger - also org/project
Clint Byrumead6c562017-02-01 16:34:04 -08001662 self.updateConfigLayout('layout-idle')
Steve Varnau7b78b312015-04-03 14:49:46 -07001663 self.sched.reconfigure(self.config)
Steve Varnau7b78b312015-04-03 14:49:46 -07001664 # The pipeline triggers every second, so we should have seen
1665 # several by now.
1666 time.sleep(5)
1667 self.waitUntilSettled()
1668 # Stop queuing timer triggered jobs so that the assertions
1669 # below don't race against more jobs being queued.
Clint Byrumead6c562017-02-01 16:34:04 -08001670 # Must be in same repo, so overwrite config with another one
Clint Byrum58264dc2017-02-07 21:21:22 -08001671 self.commitLayoutUpdate('layout-idle', 'layout-no-timer')
Clint Byrumead6c562017-02-01 16:34:04 -08001672
Steve Varnau7b78b312015-04-03 14:49:46 -07001673 self.sched.reconfigure(self.config)
Steve Varnau7b78b312015-04-03 14:49:46 -07001674 self.assertEqual(len(self.builds), 2, "Two timer jobs")
1675
1676 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1677 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1678 self.waitUntilSettled()
1679 self.assertEqual(len(self.builds), 3, "One change plus two timer jobs")
1680
1681 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
1682 self.waitUntilSettled()
1683
1684 self.assertEqual(len(self.builds), 2, "Two timer jobs remain")
1685
Paul Belanger174a8272017-03-14 13:20:10 -04001686 self.executor_server.release()
Steve Varnau7b78b312015-04-03 14:49:46 -07001687 self.waitUntilSettled()
1688
Arx Cruzb1b010d2013-10-28 19:49:59 -02001689 def test_zuul_url_return(self):
1690 "Test if ZUUL_URL is returning when zuul_url is set in zuul.conf"
James E. Blair4076e2b2014-01-28 12:42:20 -08001691 self.assertTrue(self.sched.config.has_option('merger', 'zuul_url'))
Paul Belanger174a8272017-03-14 13:20:10 -04001692 self.executor_server.hold_jobs_in_build = True
Arx Cruzb1b010d2013-10-28 19:49:59 -02001693
1694 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001695 A.addApproval('code-review', 2)
1696 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Arx Cruzb1b010d2013-10-28 19:49:59 -02001697 self.waitUntilSettled()
1698
1699 self.assertEqual(len(self.builds), 1)
1700 for build in self.builds:
1701 self.assertTrue('ZUUL_URL' in build.parameters)
1702
Paul Belanger174a8272017-03-14 13:20:10 -04001703 self.executor_server.hold_jobs_in_build = False
1704 self.executor_server.release()
Arx Cruzb1b010d2013-10-28 19:49:59 -02001705 self.waitUntilSettled()
1706
James E. Blair2fa50962013-01-30 21:50:41 -08001707 def test_new_patchset_dequeues_old_on_head(self):
1708 "Test that a new patchset causes the old to be dequeued (at head)"
1709 # D -> C (depends on B) -> B (depends on A) -> A -> M
Paul Belanger174a8272017-03-14 13:20:10 -04001710 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08001711 M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M')
1712 M.setMerged()
1713 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1714 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1715 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1716 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
James E. Blair8b5408c2016-08-08 15:37:46 -07001717 A.addApproval('code-review', 2)
1718 B.addApproval('code-review', 2)
1719 C.addApproval('code-review', 2)
1720 D.addApproval('code-review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08001721
1722 C.setDependsOn(B, 1)
1723 B.setDependsOn(A, 1)
1724 A.setDependsOn(M, 1)
1725
James E. Blair8b5408c2016-08-08 15:37:46 -07001726 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
1727 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1728 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1729 self.fake_gerrit.addEvent(D.addApproval('approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08001730 self.waitUntilSettled()
1731
1732 A.addPatchset()
1733 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
1734 self.waitUntilSettled()
1735
Paul Belanger174a8272017-03-14 13:20:10 -04001736 self.executor_server.hold_jobs_in_build = False
1737 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08001738 self.waitUntilSettled()
1739
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001740 self.assertEqual(A.data['status'], 'NEW')
1741 self.assertEqual(A.reported, 2)
1742 self.assertEqual(B.data['status'], 'NEW')
1743 self.assertEqual(B.reported, 2)
1744 self.assertEqual(C.data['status'], 'NEW')
1745 self.assertEqual(C.reported, 2)
1746 self.assertEqual(D.data['status'], 'MERGED')
1747 self.assertEqual(D.reported, 2)
1748 self.assertEqual(len(self.history), 7)
James E. Blair2fa50962013-01-30 21:50:41 -08001749
1750 def test_new_patchset_dequeues_old_without_dependents(self):
1751 "Test that a new patchset causes only the old to be dequeued"
Paul Belanger174a8272017-03-14 13:20:10 -04001752 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08001753 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1754 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1755 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -07001756 A.addApproval('code-review', 2)
1757 B.addApproval('code-review', 2)
1758 C.addApproval('code-review', 2)
James E. Blair2fa50962013-01-30 21:50:41 -08001759
James E. Blair8b5408c2016-08-08 15:37:46 -07001760 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1761 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1762 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair2fa50962013-01-30 21:50:41 -08001763 self.waitUntilSettled()
1764
1765 B.addPatchset()
1766 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1767 self.waitUntilSettled()
1768
Paul Belanger174a8272017-03-14 13:20:10 -04001769 self.executor_server.hold_jobs_in_build = False
1770 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08001771 self.waitUntilSettled()
1772
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001773 self.assertEqual(A.data['status'], 'MERGED')
1774 self.assertEqual(A.reported, 2)
1775 self.assertEqual(B.data['status'], 'NEW')
1776 self.assertEqual(B.reported, 2)
1777 self.assertEqual(C.data['status'], 'MERGED')
1778 self.assertEqual(C.reported, 2)
1779 self.assertEqual(len(self.history), 9)
James E. Blair2fa50962013-01-30 21:50:41 -08001780
1781 def test_new_patchset_dequeues_old_independent_queue(self):
1782 "Test that a new patchset causes the old to be dequeued (independent)"
Paul Belanger174a8272017-03-14 13:20:10 -04001783 self.executor_server.hold_jobs_in_build = True
James E. Blair2fa50962013-01-30 21:50:41 -08001784 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
1785 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1786 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
1787 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1788 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
1789 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
1790 self.waitUntilSettled()
1791
1792 B.addPatchset()
1793 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2))
1794 self.waitUntilSettled()
1795
Paul Belanger174a8272017-03-14 13:20:10 -04001796 self.executor_server.hold_jobs_in_build = False
1797 self.executor_server.release()
James E. Blair2fa50962013-01-30 21:50:41 -08001798 self.waitUntilSettled()
1799
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001800 self.assertEqual(A.data['status'], 'NEW')
1801 self.assertEqual(A.reported, 1)
1802 self.assertEqual(B.data['status'], 'NEW')
1803 self.assertEqual(B.reported, 1)
1804 self.assertEqual(C.data['status'], 'NEW')
1805 self.assertEqual(C.reported, 1)
1806 self.assertEqual(len(self.history), 10)
1807 self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1)
James E. Blair7d0dedc2013-02-21 17:26:09 -08001808
James E. Blair18c64442014-03-18 10:14:45 -07001809 def test_noop_job(self):
1810 "Test that the internal noop job works"
1811 A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001812 A.addApproval('code-review', 2)
1813 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair18c64442014-03-18 10:14:45 -07001814 self.waitUntilSettled()
1815
1816 self.assertEqual(len(self.gearman_server.getQueue()), 0)
1817 self.assertTrue(self.sched._areAllBuildsComplete())
1818 self.assertEqual(len(self.history), 0)
1819 self.assertEqual(A.data['status'], 'MERGED')
1820 self.assertEqual(A.reported, 2)
1821
Evgeny Antyshevd6e546c2015-06-11 15:13:57 +00001822 def test_no_job_project(self):
1823 "Test that reports with no jobs don't get sent"
1824 A = self.fake_gerrit.addFakeChange('org/no-jobs-project',
1825 'master', 'A')
1826 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
1827 self.waitUntilSettled()
1828
1829 # Change wasn't reported to
1830 self.assertEqual(A.reported, False)
1831
1832 # Check queue is empty afterwards
Clint Byrum883c30e2016-12-13 11:54:33 -08001833 tenant = self.sched.abide.tenants.get('tenant-one')
1834 check_pipeline = tenant.layout.pipelines['check']
Evgeny Antyshevd6e546c2015-06-11 15:13:57 +00001835 items = check_pipeline.getAllItems()
1836 self.assertEqual(len(items), 0)
1837
1838 self.assertEqual(len(self.history), 0)
1839
James E. Blair7d0dedc2013-02-21 17:26:09 -08001840 def test_zuul_refs(self):
1841 "Test that zuul refs exist and have the right changes"
Paul Belanger174a8272017-03-14 13:20:10 -04001842 self.executor_server.hold_jobs_in_build = True
James E. Blair7d0dedc2013-02-21 17:26:09 -08001843 M1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'M1')
1844 M1.setMerged()
1845 M2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'M2')
1846 M2.setMerged()
1847
1848 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
1849 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
1850 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
1851 D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D')
James E. Blair8b5408c2016-08-08 15:37:46 -07001852 A.addApproval('code-review', 2)
1853 B.addApproval('code-review', 2)
1854 C.addApproval('code-review', 2)
1855 D.addApproval('code-review', 2)
1856 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
1857 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
1858 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
1859 self.fake_gerrit.addEvent(D.addApproval('approved', 1))
James E. Blair7d0dedc2013-02-21 17:26:09 -08001860
1861 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001862 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08001863 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001864 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08001865 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001866 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08001867 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04001868 self.executor_server.release('.*-merge')
James E. Blair7d0dedc2013-02-21 17:26:09 -08001869 self.waitUntilSettled()
1870
James E. Blair7d0dedc2013-02-21 17:26:09 -08001871 a_zref = b_zref = c_zref = d_zref = None
Clint Byrum3343e3e2016-11-15 16:05:03 -08001872 a_build = b_build = c_build = d_build = None
Monty Taylor6bef8ef2013-06-02 08:17:12 -04001873 for x in self.builds:
James E. Blair7d0dedc2013-02-21 17:26:09 -08001874 if x.parameters['ZUUL_CHANGE'] == '3':
1875 a_zref = x.parameters['ZUUL_REF']
Clint Byrum3343e3e2016-11-15 16:05:03 -08001876 a_build = x
1877 elif x.parameters['ZUUL_CHANGE'] == '4':
James E. Blair7d0dedc2013-02-21 17:26:09 -08001878 b_zref = x.parameters['ZUUL_REF']
Clint Byrum3343e3e2016-11-15 16:05:03 -08001879 b_build = x
1880 elif x.parameters['ZUUL_CHANGE'] == '5':
James E. Blair7d0dedc2013-02-21 17:26:09 -08001881 c_zref = x.parameters['ZUUL_REF']
Clint Byrum3343e3e2016-11-15 16:05:03 -08001882 c_build = x
1883 elif x.parameters['ZUUL_CHANGE'] == '6':
James E. Blair7d0dedc2013-02-21 17:26:09 -08001884 d_zref = x.parameters['ZUUL_REF']
Clint Byrum3343e3e2016-11-15 16:05:03 -08001885 d_build = x
1886 if a_build and b_build and c_build and d_build:
1887 break
James E. Blair7d0dedc2013-02-21 17:26:09 -08001888
1889 # There are... four... refs.
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001890 self.assertIsNotNone(a_zref)
1891 self.assertIsNotNone(b_zref)
1892 self.assertIsNotNone(c_zref)
1893 self.assertIsNotNone(d_zref)
James E. Blair7d0dedc2013-02-21 17:26:09 -08001894
1895 # And they should all be different
1896 refs = set([a_zref, b_zref, c_zref, d_zref])
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001897 self.assertEqual(len(refs), 4)
James E. Blair7d0dedc2013-02-21 17:26:09 -08001898
Clint Byrum3343e3e2016-11-15 16:05:03 -08001899 # should have a, not b, and should not be in project2
1900 self.assertTrue(a_build.hasChanges(A))
1901 self.assertFalse(a_build.hasChanges(B, M2))
James E. Blair7d0dedc2013-02-21 17:26:09 -08001902
Clint Byrum3343e3e2016-11-15 16:05:03 -08001903 # should have a and b, and should not be in project2
1904 self.assertTrue(b_build.hasChanges(A, B))
1905 self.assertFalse(b_build.hasChanges(M2))
James E. Blair7d0dedc2013-02-21 17:26:09 -08001906
Clint Byrum3343e3e2016-11-15 16:05:03 -08001907 # should have a and b in 1, c in 2
1908 self.assertTrue(c_build.hasChanges(A, B, C))
1909 self.assertFalse(c_build.hasChanges(D))
James E. Blair7d0dedc2013-02-21 17:26:09 -08001910
Clint Byrum3343e3e2016-11-15 16:05:03 -08001911 # should have a and b in 1, c and d in 2
1912 self.assertTrue(d_build.hasChanges(A, B, C, D))
James E. Blair7d0dedc2013-02-21 17:26:09 -08001913
Paul Belanger174a8272017-03-14 13:20:10 -04001914 self.executor_server.hold_jobs_in_build = False
1915 self.executor_server.release()
James E. Blair7d0dedc2013-02-21 17:26:09 -08001916 self.waitUntilSettled()
1917
Monty Taylor98f0f3e2013-07-06 16:02:31 -04001918 self.assertEqual(A.data['status'], 'MERGED')
1919 self.assertEqual(A.reported, 2)
1920 self.assertEqual(B.data['status'], 'MERGED')
1921 self.assertEqual(B.reported, 2)
1922 self.assertEqual(C.data['status'], 'MERGED')
1923 self.assertEqual(C.reported, 2)
1924 self.assertEqual(D.data['status'], 'MERGED')
1925 self.assertEqual(D.reported, 2)
James E. Blair70c71582013-03-06 08:50:50 -08001926
James E. Blair4a28a882013-08-23 15:17:33 -07001927 def test_rerun_on_error(self):
1928 "Test that if a worker fails to run a job, it is run again"
Paul Belanger174a8272017-03-14 13:20:10 -04001929 self.executor_server.hold_jobs_in_build = True
James E. Blair4a28a882013-08-23 15:17:33 -07001930 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001931 A.addApproval('code-review', 2)
1932 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair4a28a882013-08-23 15:17:33 -07001933 self.waitUntilSettled()
1934
James E. Blair412fba82017-01-26 15:00:50 -08001935 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04001936 self.executor_server.hold_jobs_in_build = False
1937 self.executor_server.release()
James E. Blair4a28a882013-08-23 15:17:33 -07001938 self.waitUntilSettled()
James E. Blair412fba82017-01-26 15:00:50 -08001939 self.assertEqual(self.countJobResults(self.history, None), 1)
James E. Blair4a28a882013-08-23 15:17:33 -07001940 self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3)
1941
James E. Blair412e5582013-04-22 15:50:12 -07001942 def test_statsd(self):
1943 "Test each of the statsd methods used in the scheduler"
1944 import extras
1945 statsd = extras.try_import('statsd.statsd')
1946 statsd.incr('test-incr')
1947 statsd.timing('test-timing', 3)
Alex Gaynor813d39b2014-05-17 16:17:16 -07001948 statsd.gauge('test-gauge', 12)
James E. Blair412e5582013-04-22 15:50:12 -07001949 self.assertReportedStat('test-incr', '1|c')
1950 self.assertReportedStat('test-timing', '3|ms')
Alex Gaynor813d39b2014-05-17 16:17:16 -07001951 self.assertReportedStat('test-gauge', '12|g')
James E. Blair412e5582013-04-22 15:50:12 -07001952
James E. Blairec056492016-07-22 09:45:56 -07001953 @skip("Disabled for early v3 development")
James E. Blairdad52252014-02-07 16:59:17 -08001954 def test_stuck_job_cleanup(self):
1955 "Test that pending jobs are cleaned up if removed from layout"
James E. Blair18c64442014-03-18 10:14:45 -07001956 # This job won't be registered at startup because it is not in
1957 # the standard layout, but we need it to already be registerd
1958 # for when we reconfigure, as that is when Zuul will attempt
1959 # to run the new job.
1960 self.worker.registerFunction('build:gate-noop')
James E. Blairdad52252014-02-07 16:59:17 -08001961 self.gearman_server.hold_jobs_in_queue = True
1962 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07001963 A.addApproval('code-review', 2)
1964 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blairdad52252014-02-07 16:59:17 -08001965 self.waitUntilSettled()
1966 self.assertEqual(len(self.gearman_server.getQueue()), 1)
1967
James E. Blairf84026c2015-12-08 16:11:46 -08001968 self.updateConfigLayout(
1969 'tests/fixtures/layout-no-jobs.yaml')
James E. Blairdad52252014-02-07 16:59:17 -08001970 self.sched.reconfigure(self.config)
1971 self.waitUntilSettled()
1972
James E. Blair18c64442014-03-18 10:14:45 -07001973 self.gearman_server.release('gate-noop')
James E. Blairdad52252014-02-07 16:59:17 -08001974 self.waitUntilSettled()
1975 self.assertEqual(len(self.gearman_server.getQueue()), 0)
1976 self.assertTrue(self.sched._areAllBuildsComplete())
1977
1978 self.assertEqual(len(self.history), 1)
James E. Blair18c64442014-03-18 10:14:45 -07001979 self.assertEqual(self.history[0].name, 'gate-noop')
James E. Blairdad52252014-02-07 16:59:17 -08001980 self.assertEqual(self.history[0].result, 'SUCCESS')
1981
James E. Blair879dafb2015-07-17 14:04:49 -07001982 def test_file_head(self):
1983 # This is a regression test for an observed bug. A change
1984 # with a file named "HEAD" in the root directory of the repo
1985 # was processed by a merger. It then was unable to reset the
1986 # repo because of:
1987 # GitCommandError: 'git reset --hard HEAD' returned
1988 # with exit code 128
1989 # stderr: 'fatal: ambiguous argument 'HEAD': both revision
1990 # and filename
1991 # Use '--' to separate filenames from revisions'
1992
1993 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Paul Belangera91095f2016-11-04 19:28:48 -04001994 A.addPatchset({'HEAD': ''})
James E. Blair879dafb2015-07-17 14:04:49 -07001995 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
1996
1997 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
1998 self.waitUntilSettled()
1999
2000 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
2001 self.waitUntilSettled()
2002
2003 self.assertIn('Build succeeded', A.messages[0])
2004 self.assertIn('Build succeeded', B.messages[0])
2005
James E. Blair70c71582013-03-06 08:50:50 -08002006 def test_file_jobs(self):
2007 "Test that file jobs run only when appropriate"
2008 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
Adam Gandelman5661bda2017-02-03 15:58:03 -08002009 A.addPatchset({'pip-requires': 'foo'})
James E. Blair70c71582013-03-06 08:50:50 -08002010 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07002011 A.addApproval('code-review', 2)
2012 B.addApproval('code-review', 2)
2013 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
2014 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair70c71582013-03-06 08:50:50 -08002015 self.waitUntilSettled()
2016
Monty Taylor6bef8ef2013-06-02 08:17:12 -04002017 testfile_jobs = [x for x in self.history
James E. Blair70c71582013-03-06 08:50:50 -08002018 if x.name == 'project-testfile']
2019
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002020 self.assertEqual(len(testfile_jobs), 1)
2021 self.assertEqual(testfile_jobs[0].changes, '1,2')
2022 self.assertEqual(A.data['status'], 'MERGED')
2023 self.assertEqual(A.reported, 2)
2024 self.assertEqual(B.data['status'], 'MERGED')
2025 self.assertEqual(B.reported, 2)
James E. Blair3c5e5b52013-04-26 11:17:03 -07002026
Clint Byrum3ee39f32016-11-17 23:45:07 -08002027 def _test_irrelevant_files_jobs(self, should_skip):
2028 "Test that jobs with irrelevant-files filter run only when appropriate"
2029 self.updateConfigLayout('layout-irrelevant-files')
Maru Newby3fe5f852015-01-13 04:22:14 +00002030 self.sched.reconfigure(self.config)
Clint Byrum3ee39f32016-11-17 23:45:07 -08002031
2032 if should_skip:
2033 files = {'ignoreme': 'ignored\n'}
2034 else:
2035 files = {'respectme': 'please!\n'}
Maru Newby3fe5f852015-01-13 04:22:14 +00002036
2037 change = self.fake_gerrit.addFakeChange('org/project',
Clint Byrum3ee39f32016-11-17 23:45:07 -08002038 'master',
2039 'test irrelevant-files',
2040 files=files)
Maru Newby3fe5f852015-01-13 04:22:14 +00002041 self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1))
2042 self.waitUntilSettled()
2043
2044 tested_change_ids = [x.changes[0] for x in self.history
Clint Byrum3ee39f32016-11-17 23:45:07 -08002045 if x.name == 'project-test-irrelevant-files']
Maru Newby3fe5f852015-01-13 04:22:14 +00002046
2047 if should_skip:
2048 self.assertEqual([], tested_change_ids)
2049 else:
2050 self.assertIn(change.data['number'], tested_change_ids)
2051
Clint Byrum3ee39f32016-11-17 23:45:07 -08002052 def test_irrelevant_files_match_skips_job(self):
2053 self._test_irrelevant_files_jobs(should_skip=True)
Maru Newby3fe5f852015-01-13 04:22:14 +00002054
Clint Byrum3ee39f32016-11-17 23:45:07 -08002055 def test_irrelevant_files_no_match_runs_job(self):
2056 self._test_irrelevant_files_jobs(should_skip=False)
Maru Newby3fe5f852015-01-13 04:22:14 +00002057
Clint Byrum85493602016-11-18 11:59:47 -08002058 def test_inherited_jobs_keep_matchers(self):
2059 self.updateConfigLayout('layout-inheritance')
2060 self.sched.reconfigure(self.config)
2061
2062 files = {'ignoreme': 'ignored\n'}
2063
2064 change = self.fake_gerrit.addFakeChange('org/project',
2065 'master',
2066 'test irrelevant-files',
2067 files=files)
2068 self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1))
2069 self.waitUntilSettled()
2070
2071 run_jobs = set([build.name for build in self.history])
2072
2073 self.assertEqual(set(['project-test-nomatch-starts-empty',
2074 'project-test-nomatch-starts-full']), run_jobs)
2075
James E. Blairec056492016-07-22 09:45:56 -07002076 @skip("Disabled for early v3 development")
James E. Blair3c5e5b52013-04-26 11:17:03 -07002077 def test_test_config(self):
2078 "Test that we can test the config"
James E. Blairf84026c2015-12-08 16:11:46 -08002079 self.sched.testConfig(self.config.get('zuul', 'tenant_config'),
Joshua Hesketh352264b2015-08-11 23:42:08 +10002080 self.connections)
James E. Blair1f4c2bb2013-04-26 08:40:46 -07002081
James E. Blairc8a1e052014-02-25 09:29:26 -08002082 def test_queue_names(self):
2083 "Test shared change queue names"
Paul Belanger8e68fc22017-02-06 16:24:49 -05002084 tenant = self.sched.abide.tenants.get('tenant-one')
2085 source = tenant.layout.pipelines['gate'].source
2086 project1 = source.getProject('org/project1')
2087 project2 = source.getProject('org/project2')
2088 q1 = tenant.layout.pipelines['gate'].getQueue(project1)
2089 q2 = tenant.layout.pipelines['gate'].getQueue(project2)
2090 self.assertEqual(q1.name, 'integrated')
2091 self.assertEqual(q2.name, 'integrated')
James E. Blairc8a1e052014-02-25 09:29:26 -08002092
James E. Blair64ed6f22013-07-10 14:07:23 -07002093 def test_queue_precedence(self):
2094 "Test that queue precedence works"
2095
2096 self.gearman_server.hold_jobs_in_queue = True
Paul Belanger174a8272017-03-14 13:20:10 -04002097 self.executor_server.hold_jobs_in_build = True
James E. Blair64ed6f22013-07-10 14:07:23 -07002098 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2099 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
James E. Blair8b5408c2016-08-08 15:37:46 -07002100 A.addApproval('code-review', 2)
2101 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair64ed6f22013-07-10 14:07:23 -07002102
2103 self.waitUntilSettled()
2104 self.gearman_server.hold_jobs_in_queue = False
2105 self.gearman_server.release()
2106 self.waitUntilSettled()
2107
James E. Blair8de58bd2013-07-18 16:23:33 -07002108 # Run one build at a time to ensure non-race order:
James E. Blairb8c16472015-05-05 14:55:26 -07002109 self.orderedRelease()
Paul Belanger174a8272017-03-14 13:20:10 -04002110 self.executor_server.hold_jobs_in_build = False
James E. Blair8de58bd2013-07-18 16:23:33 -07002111 self.waitUntilSettled()
2112
James E. Blair64ed6f22013-07-10 14:07:23 -07002113 self.log.debug(self.history)
2114 self.assertEqual(self.history[0].pipeline, 'gate')
2115 self.assertEqual(self.history[1].pipeline, 'check')
2116 self.assertEqual(self.history[2].pipeline, 'gate')
2117 self.assertEqual(self.history[3].pipeline, 'gate')
2118 self.assertEqual(self.history[4].pipeline, 'check')
2119 self.assertEqual(self.history[5].pipeline, 'check')
2120
Clark Boylana5edbe42014-06-03 16:39:10 -07002121 def test_json_status(self):
James E. Blair1843a552013-07-03 14:19:52 -07002122 "Test that we can retrieve JSON status info"
Paul Belanger174a8272017-03-14 13:20:10 -04002123 self.executor_server.hold_jobs_in_build = True
James E. Blair1843a552013-07-03 14:19:52 -07002124 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07002125 A.addApproval('code-review', 2)
2126 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair1843a552013-07-03 14:19:52 -07002127 self.waitUntilSettled()
2128
Paul Belanger174a8272017-03-14 13:20:10 -04002129 self.executor_server.release('project-merge')
James E. Blairb7273ef2016-04-19 08:58:51 -07002130 self.waitUntilSettled()
2131
James E. Blair1843a552013-07-03 14:19:52 -07002132 port = self.webapp.server.socket.getsockname()[1]
2133
Adam Gandelman77a12c72017-02-03 17:43:43 -08002134 req = urllib.request.Request(
2135 "http://localhost:%s/tenant-one/status" % port)
Morgan Fainberg293f7f82016-05-30 14:01:22 -07002136 f = urllib.request.urlopen(req)
Clark Boylanaa4f2e72014-06-03 21:22:40 -07002137 headers = f.info()
2138 self.assertIn('Content-Length', headers)
2139 self.assertIn('Content-Type', headers)
Sachi Kingdc963fc2016-03-23 16:00:33 +11002140 self.assertIsNotNone(re.match('^application/json(; charset=UTF-8)?$',
2141 headers['Content-Type']))
Timo Tijhof0ebd2932015-04-02 12:11:21 +01002142 self.assertIn('Access-Control-Allow-Origin', headers)
2143 self.assertIn('Cache-Control', headers)
Clark Boylanaa4f2e72014-06-03 21:22:40 -07002144 self.assertIn('Last-Modified', headers)
Timo Tijhof0ebd2932015-04-02 12:11:21 +01002145 self.assertIn('Expires', headers)
James E. Blair1843a552013-07-03 14:19:52 -07002146 data = f.read()
2147
Paul Belanger174a8272017-03-14 13:20:10 -04002148 self.executor_server.hold_jobs_in_build = False
2149 self.executor_server.release()
James E. Blair1843a552013-07-03 14:19:52 -07002150 self.waitUntilSettled()
2151
2152 data = json.loads(data)
James E. Blairb7273ef2016-04-19 08:58:51 -07002153 status_jobs = []
James E. Blair1843a552013-07-03 14:19:52 -07002154 for p in data['pipelines']:
2155 for q in p['change_queues']:
James E. Blairbfb8e042014-12-30 17:01:44 -08002156 if p['name'] in ['gate', 'conflict']:
Clark Boylanaf2476f2014-01-23 14:47:36 -08002157 self.assertEqual(q['window'], 20)
2158 else:
2159 self.assertEqual(q['window'], 0)
James E. Blair1843a552013-07-03 14:19:52 -07002160 for head in q['heads']:
2161 for change in head:
Clark Boylanaf2476f2014-01-23 14:47:36 -08002162 self.assertTrue(change['active'])
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002163 self.assertEqual(change['id'], '1,1')
James E. Blair1843a552013-07-03 14:19:52 -07002164 for job in change['jobs']:
James E. Blairb7273ef2016-04-19 08:58:51 -07002165 status_jobs.append(job)
2166 self.assertEqual('project-merge', status_jobs[0]['name'])
2167 self.assertEqual('https://server/job/project-merge/0/',
2168 status_jobs[0]['url'])
Adam Gandelman77a12c72017-02-03 17:43:43 -08002169 self.assertEqual('https://server/job/project-merge/0/',
James E. Blairb7273ef2016-04-19 08:58:51 -07002170 status_jobs[0]['report_url'])
James E. Blairb7273ef2016-04-19 08:58:51 -07002171 self.assertEqual('project-test1', status_jobs[1]['name'])
Adam Gandelman77a12c72017-02-03 17:43:43 -08002172 self.assertEqual('https://server/job/project-test1/0/',
James E. Blairb7273ef2016-04-19 08:58:51 -07002173 status_jobs[1]['url'])
Adam Gandelman77a12c72017-02-03 17:43:43 -08002174 self.assertEqual('https://server/job/project-test1/0/',
James E. Blairb7273ef2016-04-19 08:58:51 -07002175 status_jobs[1]['report_url'])
2176
2177 self.assertEqual('project-test2', status_jobs[2]['name'])
Adam Gandelman77a12c72017-02-03 17:43:43 -08002178 self.assertEqual('https://server/job/project-test2/0/',
James E. Blairb7273ef2016-04-19 08:58:51 -07002179 status_jobs[2]['url'])
Adam Gandelman77a12c72017-02-03 17:43:43 -08002180 self.assertEqual('https://server/job/project-test2/0/',
James E. Blairb7273ef2016-04-19 08:58:51 -07002181 status_jobs[2]['report_url'])
James E. Blair1843a552013-07-03 14:19:52 -07002182
James E. Blairec056492016-07-22 09:45:56 -07002183 @skip("Disabled for early v3 development")
James E. Blairc3d428e2013-12-03 15:06:48 -08002184 def test_merging_queues(self):
2185 "Test that transitively-connected change queues are merged"
James E. Blairf84026c2015-12-08 16:11:46 -08002186 self.updateConfigLayout(
2187 'tests/fixtures/layout-merge-queues.yaml')
James E. Blairc3d428e2013-12-03 15:06:48 -08002188 self.sched.reconfigure(self.config)
2189 self.assertEqual(len(self.sched.layout.pipelines['gate'].queues), 1)
2190
James E. Blairaf17a972016-02-03 15:07:18 -08002191 def test_mutex(self):
2192 "Test job mutexes"
Adam Gandelmanea9ac9b2017-02-03 16:59:58 -08002193 self.updateConfigLayout('layout-mutex')
James E. Blairaf17a972016-02-03 15:07:18 -08002194 self.sched.reconfigure(self.config)
2195
Paul Belanger174a8272017-03-14 13:20:10 -04002196 self.executor_server.hold_jobs_in_build = True
James E. Blairaf17a972016-02-03 15:07:18 -08002197 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2198 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2199 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2200
2201 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2202 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
2203 self.waitUntilSettled()
2204 self.assertEqual(len(self.builds), 3)
2205 self.assertEqual(self.builds[0].name, 'project-test1')
2206 self.assertEqual(self.builds[1].name, 'mutex-one')
2207 self.assertEqual(self.builds[2].name, 'project-test1')
2208
Paul Belanger174a8272017-03-14 13:20:10 -04002209 self.executor_server.release('mutex-one')
James E. Blairaf17a972016-02-03 15:07:18 -08002210 self.waitUntilSettled()
2211
2212 self.assertEqual(len(self.builds), 3)
2213 self.assertEqual(self.builds[0].name, 'project-test1')
2214 self.assertEqual(self.builds[1].name, 'project-test1')
2215 self.assertEqual(self.builds[2].name, 'mutex-two')
2216 self.assertTrue('test-mutex' in self.sched.mutex.mutexes)
2217
Paul Belanger174a8272017-03-14 13:20:10 -04002218 self.executor_server.release('mutex-two')
James E. Blairaf17a972016-02-03 15:07:18 -08002219 self.waitUntilSettled()
2220
2221 self.assertEqual(len(self.builds), 3)
2222 self.assertEqual(self.builds[0].name, 'project-test1')
2223 self.assertEqual(self.builds[1].name, 'project-test1')
2224 self.assertEqual(self.builds[2].name, 'mutex-one')
2225 self.assertTrue('test-mutex' in self.sched.mutex.mutexes)
2226
Paul Belanger174a8272017-03-14 13:20:10 -04002227 self.executor_server.release('mutex-one')
James E. Blairaf17a972016-02-03 15:07:18 -08002228 self.waitUntilSettled()
2229
2230 self.assertEqual(len(self.builds), 3)
2231 self.assertEqual(self.builds[0].name, 'project-test1')
2232 self.assertEqual(self.builds[1].name, 'project-test1')
2233 self.assertEqual(self.builds[2].name, 'mutex-two')
2234 self.assertTrue('test-mutex' in self.sched.mutex.mutexes)
2235
Paul Belanger174a8272017-03-14 13:20:10 -04002236 self.executor_server.release('mutex-two')
James E. Blairaf17a972016-02-03 15:07:18 -08002237 self.waitUntilSettled()
2238
2239 self.assertEqual(len(self.builds), 2)
2240 self.assertEqual(self.builds[0].name, 'project-test1')
2241 self.assertEqual(self.builds[1].name, 'project-test1')
2242 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2243
Paul Belanger174a8272017-03-14 13:20:10 -04002244 self.executor_server.hold_jobs_in_build = False
2245 self.executor_server.release()
James E. Blairaf17a972016-02-03 15:07:18 -08002246
2247 self.waitUntilSettled()
2248 self.assertEqual(len(self.builds), 0)
2249
2250 self.assertEqual(A.reported, 1)
2251 self.assertEqual(B.reported, 1)
2252 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2253
Tobias Henkelfb91a492017-02-15 07:29:43 +01002254 def test_mutex_abandon(self):
2255 "Test abandon with job mutexes"
2256 self.updateConfigLayout('layout-mutex')
2257 self.sched.reconfigure(self.config)
2258
Paul Belanger174a8272017-03-14 13:20:10 -04002259 self.executor_server.hold_jobs_in_build = True
Tobias Henkelfb91a492017-02-15 07:29:43 +01002260
2261 tenant = self.sched.abide.tenants.get('openstack')
2262 check_pipeline = tenant.layout.pipelines['check']
2263
2264 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2265 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2266
2267 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2268 self.waitUntilSettled()
2269
2270 self.assertTrue('test-mutex' in self.sched.mutex.mutexes)
2271
2272 self.fake_gerrit.addEvent(A.getChangeAbandonedEvent())
2273 self.waitUntilSettled()
2274
2275 # The check pipeline should be empty
2276 items = check_pipeline.getAllItems()
2277 self.assertEqual(len(items), 0)
2278
2279 # The mutex should be released
2280 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2281
Paul Belanger174a8272017-03-14 13:20:10 -04002282 self.executor_server.hold_jobs_in_build = False
2283 self.executor_server.release()
Tobias Henkelfb91a492017-02-15 07:29:43 +01002284 self.waitUntilSettled()
2285
2286 def test_mutex_reconfigure(self):
2287 "Test reconfigure with job mutexes"
2288 self.updateConfigLayout('layout-mutex')
2289 self.sched.reconfigure(self.config)
2290
Paul Belanger174a8272017-03-14 13:20:10 -04002291 self.executor_server.hold_jobs_in_build = True
Tobias Henkelfb91a492017-02-15 07:29:43 +01002292
2293 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2294 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2295
2296 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2297 self.waitUntilSettled()
2298
2299 self.assertTrue('test-mutex' in self.sched.mutex.mutexes)
2300
2301 self.updateConfigLayout('layout-mutex-reconfiguration')
2302 self.sched.reconfigure(self.config)
2303 self.waitUntilSettled()
2304
Paul Belanger174a8272017-03-14 13:20:10 -04002305 self.executor_server.release('project-test1')
Tobias Henkelfb91a492017-02-15 07:29:43 +01002306 self.waitUntilSettled()
2307
2308 # There should be no builds anymore
2309 self.assertEqual(len(self.builds), 0)
2310
2311 # The mutex should be released
2312 self.assertFalse('test-mutex' in self.sched.mutex.mutexes)
2313
James E. Blaircdccd972013-07-01 12:10:22 -07002314 def test_live_reconfiguration(self):
2315 "Test that live reconfiguration works"
Paul Belanger174a8272017-03-14 13:20:10 -04002316 self.executor_server.hold_jobs_in_build = True
James E. Blaircdccd972013-07-01 12:10:22 -07002317 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07002318 A.addApproval('code-review', 2)
2319 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blaircdccd972013-07-01 12:10:22 -07002320 self.waitUntilSettled()
2321
2322 self.sched.reconfigure(self.config)
James E. Blairbd963632017-02-01 09:58:14 -08002323 self.waitUntilSettled()
James E. Blaircdccd972013-07-01 12:10:22 -07002324
Paul Belanger174a8272017-03-14 13:20:10 -04002325 self.executor_server.hold_jobs_in_build = False
2326 self.executor_server.release()
James E. Blaircdccd972013-07-01 12:10:22 -07002327 self.waitUntilSettled()
Monty Taylor98f0f3e2013-07-06 16:02:31 -04002328 self.assertEqual(self.getJobFromHistory('project-merge').result,
2329 'SUCCESS')
2330 self.assertEqual(self.getJobFromHistory('project-test1').result,
2331 'SUCCESS')
2332 self.assertEqual(self.getJobFromHistory('project-test2').result,
2333 'SUCCESS')
2334 self.assertEqual(A.data['status'], 'MERGED')
2335 self.assertEqual(A.reported, 2)
James E. Blair287c06d2013-07-24 10:39:30 -07002336
James E. Blairec056492016-07-22 09:45:56 -07002337 @skip("Disabled for early v3 development")
James E. Blair6bc782d2015-07-17 16:20:21 -07002338 def test_live_reconfiguration_merge_conflict(self):
2339 # A real-world bug: a change in a gate queue has a merge
2340 # conflict and a job is added to its project while it's
2341 # sitting in the queue. The job gets added to the change and
2342 # enqueued and the change gets stuck.
2343 self.worker.registerFunction('build:project-test3')
Paul Belanger174a8272017-03-14 13:20:10 -04002344 self.executor_server.hold_jobs_in_build = True
James E. Blair6bc782d2015-07-17 16:20:21 -07002345
2346 # This change is fine. It's here to stop the queue long
2347 # enough for the next change to be subject to the
2348 # reconfiguration, as well as to provide a conflict for the
2349 # next change. This change will succeed and merge.
2350 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2351 A.addPatchset(['conflict'])
James E. Blair8b5408c2016-08-08 15:37:46 -07002352 A.addApproval('code-review', 2)
James E. Blair6bc782d2015-07-17 16:20:21 -07002353
2354 # This change will be in merge conflict. During the
2355 # reconfiguration, we will add a job. We want to make sure
2356 # that doesn't cause it to get stuck.
2357 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
2358 B.addPatchset(['conflict'])
James E. Blair8b5408c2016-08-08 15:37:46 -07002359 B.addApproval('code-review', 2)
James E. Blair4eb21fa2015-07-27 14:56:47 -07002360
James E. Blair8b5408c2016-08-08 15:37:46 -07002361 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
2362 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002363
2364 self.waitUntilSettled()
2365
2366 # No jobs have run yet
2367 self.assertEqual(A.data['status'], 'NEW')
2368 self.assertEqual(A.reported, 1)
2369 self.assertEqual(B.data['status'], 'NEW')
2370 self.assertEqual(B.reported, 1)
2371 self.assertEqual(len(self.history), 0)
2372
2373 # Add the "project-test3" job.
James E. Blairf84026c2015-12-08 16:11:46 -08002374 self.updateConfigLayout(
2375 'tests/fixtures/layout-live-reconfiguration-add-job.yaml')
James E. Blair6bc782d2015-07-17 16:20:21 -07002376 self.sched.reconfigure(self.config)
2377 self.waitUntilSettled()
2378
Paul Belanger174a8272017-03-14 13:20:10 -04002379 self.executor_server.hold_jobs_in_build = False
2380 self.executor_server.release()
James E. Blair6bc782d2015-07-17 16:20:21 -07002381 self.waitUntilSettled()
2382
2383 self.assertEqual(A.data['status'], 'MERGED')
2384 self.assertEqual(A.reported, 2)
2385 self.assertEqual(B.data['status'], 'NEW')
2386 self.assertEqual(B.reported, 2)
2387 self.assertEqual(self.getJobFromHistory('project-merge').result,
2388 'SUCCESS')
2389 self.assertEqual(self.getJobFromHistory('project-test1').result,
2390 'SUCCESS')
2391 self.assertEqual(self.getJobFromHistory('project-test2').result,
2392 'SUCCESS')
2393 self.assertEqual(self.getJobFromHistory('project-test3').result,
2394 'SUCCESS')
2395 self.assertEqual(len(self.history), 4)
2396
James E. Blairec056492016-07-22 09:45:56 -07002397 @skip("Disabled for early v3 development")
James E. Blair400e8fd2015-07-30 17:44:45 -07002398 def test_live_reconfiguration_failed_root(self):
James E. Blair6bc782d2015-07-17 16:20:21 -07002399 # An extrapolation of test_live_reconfiguration_merge_conflict
2400 # that tests a job added to a job tree with a failed root does
2401 # not run.
2402 self.worker.registerFunction('build:project-test3')
Paul Belanger174a8272017-03-14 13:20:10 -04002403 self.executor_server.hold_jobs_in_build = True
James E. Blair6bc782d2015-07-17 16:20:21 -07002404
2405 # This change is fine. It's here to stop the queue long
2406 # enough for the next change to be subject to the
2407 # reconfiguration. This change will succeed and merge.
2408 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2409 A.addPatchset(['conflict'])
James E. Blair8b5408c2016-08-08 15:37:46 -07002410 A.addApproval('code-review', 2)
2411 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002412 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002413 self.executor_server.release('.*-merge')
James E. Blair6bc782d2015-07-17 16:20:21 -07002414 self.waitUntilSettled()
2415
2416 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
Paul Belanger174a8272017-03-14 13:20:10 -04002417 self.executor_server.failJob('project-merge', B)
James E. Blair8b5408c2016-08-08 15:37:46 -07002418 B.addApproval('code-review', 2)
2419 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair6bc782d2015-07-17 16:20:21 -07002420 self.waitUntilSettled()
2421
Paul Belanger174a8272017-03-14 13:20:10 -04002422 self.executor_server.release('.*-merge')
James E. Blair6bc782d2015-07-17 16:20:21 -07002423 self.waitUntilSettled()
2424
2425 # Both -merge jobs have run, but no others.
2426 self.assertEqual(A.data['status'], 'NEW')
2427 self.assertEqual(A.reported, 1)
2428 self.assertEqual(B.data['status'], 'NEW')
2429 self.assertEqual(B.reported, 1)
2430 self.assertEqual(self.history[0].result, 'SUCCESS')
2431 self.assertEqual(self.history[0].name, 'project-merge')
2432 self.assertEqual(self.history[1].result, 'FAILURE')
2433 self.assertEqual(self.history[1].name, 'project-merge')
2434 self.assertEqual(len(self.history), 2)
2435
2436 # Add the "project-test3" job.
James E. Blairf84026c2015-12-08 16:11:46 -08002437 self.updateConfigLayout(
2438 'tests/fixtures/layout-live-reconfiguration-add-job.yaml')
James E. Blair6bc782d2015-07-17 16:20:21 -07002439 self.sched.reconfigure(self.config)
2440 self.waitUntilSettled()
2441
Paul Belanger174a8272017-03-14 13:20:10 -04002442 self.executor_server.hold_jobs_in_build = False
2443 self.executor_server.release()
James E. Blair6bc782d2015-07-17 16:20:21 -07002444 self.waitUntilSettled()
2445
2446 self.assertEqual(A.data['status'], 'MERGED')
2447 self.assertEqual(A.reported, 2)
2448 self.assertEqual(B.data['status'], 'NEW')
2449 self.assertEqual(B.reported, 2)
2450 self.assertEqual(self.history[0].result, 'SUCCESS')
2451 self.assertEqual(self.history[0].name, 'project-merge')
2452 self.assertEqual(self.history[1].result, 'FAILURE')
2453 self.assertEqual(self.history[1].name, 'project-merge')
2454 self.assertEqual(self.history[2].result, 'SUCCESS')
2455 self.assertEqual(self.history[3].result, 'SUCCESS')
2456 self.assertEqual(self.history[4].result, 'SUCCESS')
2457 self.assertEqual(len(self.history), 5)
2458
James E. Blairec056492016-07-22 09:45:56 -07002459 @skip("Disabled for early v3 development")
James E. Blair400e8fd2015-07-30 17:44:45 -07002460 def test_live_reconfiguration_failed_job(self):
2461 # Test that a change with a removed failing job does not
2462 # disrupt reconfiguration. If a change has a failed job and
2463 # that job is removed during a reconfiguration, we observed a
2464 # bug where the code to re-set build statuses would run on
2465 # that build and raise an exception because the job no longer
2466 # existed.
Paul Belanger174a8272017-03-14 13:20:10 -04002467 self.executor_server.hold_jobs_in_build = True
James E. Blair400e8fd2015-07-30 17:44:45 -07002468
2469 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2470
2471 # This change will fail and later be removed by the reconfiguration.
Paul Belanger174a8272017-03-14 13:20:10 -04002472 self.executor_server.failJob('project-test1', A)
James E. Blair400e8fd2015-07-30 17:44:45 -07002473
2474 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2475 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002476 self.executor_server.release('.*-merge')
James E. Blair400e8fd2015-07-30 17:44:45 -07002477 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002478 self.executor_server.release('project-test1')
James E. Blair400e8fd2015-07-30 17:44:45 -07002479 self.waitUntilSettled()
2480
2481 self.assertEqual(A.data['status'], 'NEW')
2482 self.assertEqual(A.reported, 0)
2483
2484 self.assertEqual(self.getJobFromHistory('project-merge').result,
2485 'SUCCESS')
2486 self.assertEqual(self.getJobFromHistory('project-test1').result,
2487 'FAILURE')
2488 self.assertEqual(len(self.history), 2)
2489
2490 # Remove the test1 job.
James E. Blairf84026c2015-12-08 16:11:46 -08002491 self.updateConfigLayout(
2492 'tests/fixtures/layout-live-reconfiguration-failed-job.yaml')
James E. Blair400e8fd2015-07-30 17:44:45 -07002493 self.sched.reconfigure(self.config)
2494 self.waitUntilSettled()
2495
Paul Belanger174a8272017-03-14 13:20:10 -04002496 self.executor_server.hold_jobs_in_build = False
2497 self.executor_server.release()
James E. Blair400e8fd2015-07-30 17:44:45 -07002498 self.waitUntilSettled()
2499
2500 self.assertEqual(self.getJobFromHistory('project-test2').result,
2501 'SUCCESS')
2502 self.assertEqual(self.getJobFromHistory('project-testfile').result,
2503 'SUCCESS')
2504 self.assertEqual(len(self.history), 4)
2505
2506 self.assertEqual(A.data['status'], 'NEW')
2507 self.assertEqual(A.reported, 1)
2508 self.assertIn('Build succeeded', A.messages[0])
2509 # Ensure the removed job was not included in the report.
2510 self.assertNotIn('project-test1', A.messages[0])
2511
James E. Blairec056492016-07-22 09:45:56 -07002512 @skip("Disabled for early v3 development")
James E. Blairfe707d12015-08-05 15:18:15 -07002513 def test_live_reconfiguration_shared_queue(self):
2514 # Test that a change with a failing job which was removed from
2515 # this project but otherwise still exists in the system does
2516 # not disrupt reconfiguration.
2517
Paul Belanger174a8272017-03-14 13:20:10 -04002518 self.executor_server.hold_jobs_in_build = True
James E. Blairfe707d12015-08-05 15:18:15 -07002519
2520 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2521
Paul Belanger174a8272017-03-14 13:20:10 -04002522 self.executor_server.failJob('project1-project2-integration', A)
James E. Blairfe707d12015-08-05 15:18:15 -07002523
2524 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2525 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002526 self.executor_server.release('.*-merge')
James E. Blairfe707d12015-08-05 15:18:15 -07002527 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002528 self.executor_server.release('project1-project2-integration')
James E. Blairfe707d12015-08-05 15:18:15 -07002529 self.waitUntilSettled()
2530
2531 self.assertEqual(A.data['status'], 'NEW')
2532 self.assertEqual(A.reported, 0)
2533
2534 self.assertEqual(self.getJobFromHistory('project1-merge').result,
2535 'SUCCESS')
2536 self.assertEqual(self.getJobFromHistory(
2537 'project1-project2-integration').result, 'FAILURE')
2538 self.assertEqual(len(self.history), 2)
2539
2540 # Remove the integration job.
James E. Blairf84026c2015-12-08 16:11:46 -08002541 self.updateConfigLayout(
2542 'tests/fixtures/layout-live-reconfiguration-shared-queue.yaml')
James E. Blairfe707d12015-08-05 15:18:15 -07002543 self.sched.reconfigure(self.config)
2544 self.waitUntilSettled()
2545
Paul Belanger174a8272017-03-14 13:20:10 -04002546 self.executor_server.hold_jobs_in_build = False
2547 self.executor_server.release()
James E. Blairfe707d12015-08-05 15:18:15 -07002548 self.waitUntilSettled()
2549
2550 self.assertEqual(self.getJobFromHistory('project1-merge').result,
2551 'SUCCESS')
2552 self.assertEqual(self.getJobFromHistory('project1-test1').result,
2553 'SUCCESS')
2554 self.assertEqual(self.getJobFromHistory('project1-test2').result,
2555 'SUCCESS')
2556 self.assertEqual(self.getJobFromHistory(
2557 'project1-project2-integration').result, 'FAILURE')
2558 self.assertEqual(len(self.history), 4)
2559
2560 self.assertEqual(A.data['status'], 'NEW')
2561 self.assertEqual(A.reported, 1)
2562 self.assertIn('Build succeeded', A.messages[0])
2563 # Ensure the removed job was not included in the report.
2564 self.assertNotIn('project1-project2-integration', A.messages[0])
2565
James E. Blairec056492016-07-22 09:45:56 -07002566 @skip("Disabled for early v3 development")
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002567 def test_double_live_reconfiguration_shared_queue(self):
2568 # This was a real-world regression. A change is added to
2569 # gate; a reconfigure happens, a second change which depends
2570 # on the first is added, and a second reconfiguration happens.
2571 # Ensure that both changes merge.
2572
2573 # A failure may indicate incorrect caching or cleaning up of
2574 # references during a reconfiguration.
Paul Belanger174a8272017-03-14 13:20:10 -04002575 self.executor_server.hold_jobs_in_build = True
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002576
2577 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2578 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
2579 B.setDependsOn(A, 1)
James E. Blair8b5408c2016-08-08 15:37:46 -07002580 A.addApproval('code-review', 2)
2581 B.addApproval('code-review', 2)
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002582
2583 # Add the parent change.
James E. Blair8b5408c2016-08-08 15:37:46 -07002584 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002585 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002586 self.executor_server.release('.*-merge')
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002587 self.waitUntilSettled()
2588
2589 # Reconfigure (with only one change in the pipeline).
2590 self.sched.reconfigure(self.config)
2591 self.waitUntilSettled()
2592
2593 # Add the child change.
James E. Blair8b5408c2016-08-08 15:37:46 -07002594 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002595 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002596 self.executor_server.release('.*-merge')
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002597 self.waitUntilSettled()
2598
2599 # Reconfigure (with both in the pipeline).
2600 self.sched.reconfigure(self.config)
2601 self.waitUntilSettled()
2602
Paul Belanger174a8272017-03-14 13:20:10 -04002603 self.executor_server.hold_jobs_in_build = False
2604 self.executor_server.release()
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11002605 self.waitUntilSettled()
2606
2607 self.assertEqual(len(self.history), 8)
2608
2609 self.assertEqual(A.data['status'], 'MERGED')
2610 self.assertEqual(A.reported, 2)
2611 self.assertEqual(B.data['status'], 'MERGED')
2612 self.assertEqual(B.reported, 2)
2613
James E. Blairec056492016-07-22 09:45:56 -07002614 @skip("Disabled for early v3 development")
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002615 def test_live_reconfiguration_del_project(self):
2616 # Test project deletion from layout
2617 # while changes are enqueued
2618
Paul Belanger174a8272017-03-14 13:20:10 -04002619 self.executor_server.hold_jobs_in_build = True
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002620 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2621 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
2622 C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C')
2623
2624 # A Depends-On: B
2625 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
2626 A.subject, B.data['id'])
James E. Blair8b5408c2016-08-08 15:37:46 -07002627 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002628
2629 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2630 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
2631 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002632 self.executor_server.release('.*-merge')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002633 self.waitUntilSettled()
2634 self.assertEqual(len(self.builds), 5)
2635
2636 # This layout defines only org/project, not org/project1
James E. Blairf84026c2015-12-08 16:11:46 -08002637 self.updateConfigLayout(
2638 'tests/fixtures/layout-live-reconfiguration-del-project.yaml')
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002639 self.sched.reconfigure(self.config)
2640 self.waitUntilSettled()
2641
2642 # Builds for C aborted, builds for A succeed,
2643 # and have change B applied ahead
2644 job_c = self.getJobFromHistory('project1-test1')
2645 self.assertEqual(job_c.changes, '3,1')
2646 self.assertEqual(job_c.result, 'ABORTED')
2647
Paul Belanger174a8272017-03-14 13:20:10 -04002648 self.executor_server.hold_jobs_in_build = False
2649 self.executor_server.release()
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00002650 self.waitUntilSettled()
2651
2652 self.assertEqual(self.getJobFromHistory('project-test1').changes,
2653 '2,1 1,1')
2654
2655 self.assertEqual(A.data['status'], 'NEW')
2656 self.assertEqual(B.data['status'], 'NEW')
2657 self.assertEqual(C.data['status'], 'NEW')
2658 self.assertEqual(A.reported, 1)
2659 self.assertEqual(B.reported, 0)
2660 self.assertEqual(C.reported, 0)
2661
2662 self.assertEqual(len(self.sched.layout.pipelines['check'].queues), 0)
2663 self.assertIn('Build succeeded', A.messages[0])
2664
James E. Blairec056492016-07-22 09:45:56 -07002665 @skip("Disabled for early v3 development")
James E. Blaire712d9f2013-07-31 11:40:11 -07002666 def test_live_reconfiguration_functions(self):
2667 "Test live reconfiguration with a custom function"
2668 self.worker.registerFunction('build:node-project-test1:debian')
2669 self.worker.registerFunction('build:node-project-test1:wheezy')
2670 A = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07002671 A.addApproval('code-review', 2)
2672 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blaire712d9f2013-07-31 11:40:11 -07002673 self.waitUntilSettled()
2674
2675 self.assertIsNone(self.getJobFromHistory('node-project-merge').node)
2676 self.assertEqual(self.getJobFromHistory('node-project-test1').node,
2677 'debian')
2678 self.assertIsNone(self.getJobFromHistory('node-project-test2').node)
2679
James E. Blairf84026c2015-12-08 16:11:46 -08002680 self.updateConfigLayout(
2681 'tests/fixtures/layout-live-reconfiguration-functions.yaml')
James E. Blaire712d9f2013-07-31 11:40:11 -07002682 self.sched.reconfigure(self.config)
2683 self.worker.build_history = []
2684
2685 B = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07002686 B.addApproval('code-review', 2)
2687 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blaire712d9f2013-07-31 11:40:11 -07002688 self.waitUntilSettled()
2689
2690 self.assertIsNone(self.getJobFromHistory('node-project-merge').node)
2691 self.assertEqual(self.getJobFromHistory('node-project-test1').node,
2692 'wheezy')
2693 self.assertIsNone(self.getJobFromHistory('node-project-test2').node)
2694
James E. Blairec056492016-07-22 09:45:56 -07002695 @skip("Disabled for early v3 development")
James E. Blair287c06d2013-07-24 10:39:30 -07002696 def test_delayed_repo_init(self):
James E. Blairf84026c2015-12-08 16:11:46 -08002697 self.updateConfigLayout(
2698 'tests/fixtures/layout-delayed-repo-init.yaml')
James E. Blair287c06d2013-07-24 10:39:30 -07002699 self.sched.reconfigure(self.config)
2700
2701 self.init_repo("org/new-project")
2702 A = self.fake_gerrit.addFakeChange('org/new-project', 'master', 'A')
2703
James E. Blair8b5408c2016-08-08 15:37:46 -07002704 A.addApproval('code-review', 2)
2705 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair287c06d2013-07-24 10:39:30 -07002706 self.waitUntilSettled()
2707 self.assertEqual(self.getJobFromHistory('project-merge').result,
2708 'SUCCESS')
2709 self.assertEqual(self.getJobFromHistory('project-test1').result,
2710 'SUCCESS')
2711 self.assertEqual(self.getJobFromHistory('project-test2').result,
2712 'SUCCESS')
2713 self.assertEqual(A.data['status'], 'MERGED')
2714 self.assertEqual(A.reported, 2)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002715
Clark Boylan6dbbc482013-10-18 10:57:31 -07002716 def test_repo_deleted(self):
Paul Belanger66e95962016-11-11 12:11:06 -05002717 self.updateConfigLayout('layout-repo-deleted')
Clark Boylan6dbbc482013-10-18 10:57:31 -07002718 self.sched.reconfigure(self.config)
2719
2720 self.init_repo("org/delete-project")
2721 A = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'A')
2722
James E. Blair8b5408c2016-08-08 15:37:46 -07002723 A.addApproval('code-review', 2)
2724 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Clark Boylan6dbbc482013-10-18 10:57:31 -07002725 self.waitUntilSettled()
2726 self.assertEqual(self.getJobFromHistory('project-merge').result,
2727 'SUCCESS')
2728 self.assertEqual(self.getJobFromHistory('project-test1').result,
2729 'SUCCESS')
2730 self.assertEqual(self.getJobFromHistory('project-test2').result,
2731 'SUCCESS')
2732 self.assertEqual(A.data['status'], 'MERGED')
2733 self.assertEqual(A.reported, 2)
2734
2735 # Delete org/new-project zuul repo. Should be recloned.
James E. Blair8c1be532017-02-07 14:04:12 -08002736 p = 'org/delete-project'
Monty Taylord642d852017-02-23 14:05:42 -05002737 if os.path.exists(os.path.join(self.merger_src_root, p)):
2738 shutil.rmtree(os.path.join(self.merger_src_root, p))
Paul Belanger174a8272017-03-14 13:20:10 -04002739 if os.path.exists(os.path.join(self.executor_src_root, p)):
2740 shutil.rmtree(os.path.join(self.executor_src_root, p))
Clark Boylan6dbbc482013-10-18 10:57:31 -07002741
2742 B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B')
2743
James E. Blair8b5408c2016-08-08 15:37:46 -07002744 B.addApproval('code-review', 2)
2745 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
Clark Boylan6dbbc482013-10-18 10:57:31 -07002746 self.waitUntilSettled()
2747 self.assertEqual(self.getJobFromHistory('project-merge').result,
2748 'SUCCESS')
2749 self.assertEqual(self.getJobFromHistory('project-test1').result,
2750 'SUCCESS')
2751 self.assertEqual(self.getJobFromHistory('project-test2').result,
2752 'SUCCESS')
2753 self.assertEqual(B.data['status'], 'MERGED')
2754 self.assertEqual(B.reported, 2)
2755
James E. Blair456f2fb2016-02-09 09:29:33 -08002756 def test_tags(self):
2757 "Test job tags"
Cullen Taylor3aa6d472017-03-01 15:22:09 -06002758 self.updateConfigLayout('layout-tags')
James E. Blair456f2fb2016-02-09 09:29:33 -08002759 self.sched.reconfigure(self.config)
2760
2761 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
2762 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
2763 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2764 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
2765 self.waitUntilSettled()
2766
Cullen Taylor3aa6d472017-03-01 15:22:09 -06002767 self.assertEqual(len(self.history), 8)
2768
2769 results = {self.getJobFromHistory('merge',
2770 project='org/project1').uuid: 'extratag merge',
2771 self.getJobFromHistory('merge',
2772 project='org/project2').uuid: 'merge'}
James E. Blair456f2fb2016-02-09 09:29:33 -08002773
2774 for build in self.history:
Cullen Taylor3aa6d472017-03-01 15:22:09 -06002775 self.assertEqual(results.get(build.uuid, ''),
2776 build.parameters['vars']['zuul'].get('tags'))
James E. Blair456f2fb2016-02-09 09:29:33 -08002777
James E. Blair63bb0ef2013-07-29 17:14:51 -07002778 def test_timer(self):
2779 "Test that a periodic job is triggered"
Paul Belanger174a8272017-03-14 13:20:10 -04002780 self.executor_server.hold_jobs_in_build = True
Clint Byrum5e729e92017-02-08 06:34:57 -08002781 self.updateConfigLayout('layout-timer')
James E. Blair63bb0ef2013-07-29 17:14:51 -07002782 self.sched.reconfigure(self.config)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002783
Clark Boylan3ee090a2014-04-03 20:55:09 -07002784 # The pipeline triggers every second, so we should have seen
2785 # several by now.
2786 time.sleep(5)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002787 self.waitUntilSettled()
Clark Boylan3ee090a2014-04-03 20:55:09 -07002788
2789 self.assertEqual(len(self.builds), 2)
2790
James E. Blair63bb0ef2013-07-29 17:14:51 -07002791 port = self.webapp.server.socket.getsockname()[1]
2792
Clint Byrum5e729e92017-02-08 06:34:57 -08002793 req = urllib.request.Request(
2794 "http://localhost:%s/openstack/status" % port)
Morgan Fainberg293f7f82016-05-30 14:01:22 -07002795 f = urllib.request.urlopen(req)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002796 data = f.read()
2797
Paul Belanger174a8272017-03-14 13:20:10 -04002798 self.executor_server.hold_jobs_in_build = False
Clark Boylan3ee090a2014-04-03 20:55:09 -07002799 # Stop queuing timer triggered jobs so that the assertions
2800 # below don't race against more jobs being queued.
Clint Byrum5e729e92017-02-08 06:34:57 -08002801 self.commitLayoutUpdate('layout-timer', 'layout-no-timer')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002802 self.sched.reconfigure(self.config)
Paul Belanger174a8272017-03-14 13:20:10 -04002803 self.executor_server.release()
James E. Blair63bb0ef2013-07-29 17:14:51 -07002804 self.waitUntilSettled()
2805
2806 self.assertEqual(self.getJobFromHistory(
2807 'project-bitrot-stable-old').result, 'SUCCESS')
2808 self.assertEqual(self.getJobFromHistory(
2809 'project-bitrot-stable-older').result, 'SUCCESS')
2810
2811 data = json.loads(data)
2812 status_jobs = set()
2813 for p in data['pipelines']:
2814 for q in p['change_queues']:
2815 for head in q['heads']:
2816 for change in head:
Alex Gaynorddb9ef32013-09-16 21:04:58 -07002817 self.assertEqual(change['id'], None)
James E. Blair63bb0ef2013-07-29 17:14:51 -07002818 for job in change['jobs']:
2819 status_jobs.add(job['name'])
2820 self.assertIn('project-bitrot-stable-old', status_jobs)
2821 self.assertIn('project-bitrot-stable-older', status_jobs)
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002822
James E. Blair4f6033c2014-03-27 15:49:09 -07002823 def test_idle(self):
2824 "Test that frequent periodic jobs work"
Paul Belanger174a8272017-03-14 13:20:10 -04002825 self.executor_server.hold_jobs_in_build = True
Clint Byrum58264dc2017-02-07 21:21:22 -08002826 self.updateConfigLayout('layout-idle')
James E. Blair4f6033c2014-03-27 15:49:09 -07002827
Clark Boylan3ee090a2014-04-03 20:55:09 -07002828 for x in range(1, 3):
2829 # Test that timer triggers periodic jobs even across
2830 # layout config reloads.
2831 # Start timer trigger
Clark Boylan3ee090a2014-04-03 20:55:09 -07002832 self.sched.reconfigure(self.config)
James E. Blair995fc0f2016-02-04 16:48:31 -08002833 self.waitUntilSettled()
James E. Blair4f6033c2014-03-27 15:49:09 -07002834
Clark Boylan3ee090a2014-04-03 20:55:09 -07002835 # The pipeline triggers every second, so we should have seen
2836 # several by now.
2837 time.sleep(5)
Clark Boylan3ee090a2014-04-03 20:55:09 -07002838
2839 # Stop queuing timer triggered jobs so that the assertions
2840 # below don't race against more jobs being queued.
Clint Byrum58264dc2017-02-07 21:21:22 -08002841 before = self.commitLayoutUpdate('layout-idle', 'layout-no-timer')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002842 self.sched.reconfigure(self.config)
James E. Blair995fc0f2016-02-04 16:48:31 -08002843 self.waitUntilSettled()
Clint Byrum58264dc2017-02-07 21:21:22 -08002844 self.assertEqual(len(self.builds), 2,
2845 'Timer builds iteration #%d' % x)
Paul Belanger174a8272017-03-14 13:20:10 -04002846 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002847 self.waitUntilSettled()
2848 self.assertEqual(len(self.builds), 0)
2849 self.assertEqual(len(self.history), x * 2)
Clint Byrum58264dc2017-02-07 21:21:22 -08002850 # Revert back to layout-idle
2851 repo = git.Repo(os.path.join(self.test_root,
2852 'upstream',
2853 'layout-idle'))
2854 repo.git.reset('--hard', before)
James E. Blair4f6033c2014-03-27 15:49:09 -07002855
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002856 def test_check_smtp_pool(self):
Paul Belanger01be8ca2016-11-11 12:21:06 -05002857 self.updateConfigLayout('layout-smtp')
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002858 self.sched.reconfigure(self.config)
2859
2860 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
2861 self.waitUntilSettled()
2862
2863 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
2864 self.waitUntilSettled()
2865
James E. Blairff80a2f2013-12-27 13:24:06 -08002866 self.assertEqual(len(self.smtp_messages), 2)
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002867
2868 # A.messages only holds what FakeGerrit places in it. Thus we
2869 # work on the knowledge of what the first message should be as
2870 # it is only configured to go to SMTP.
2871
2872 self.assertEqual('zuul@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08002873 self.smtp_messages[0]['from_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002874 self.assertEqual(['you@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08002875 self.smtp_messages[0]['to_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002876 self.assertEqual('Starting check jobs.',
James E. Blairff80a2f2013-12-27 13:24:06 -08002877 self.smtp_messages[0]['body'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002878
2879 self.assertEqual('zuul_from@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08002880 self.smtp_messages[1]['from_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002881 self.assertEqual(['alternative_me@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08002882 self.smtp_messages[1]['to_email'])
Joshua Hesketh5fea8672013-08-19 17:32:01 +10002883 self.assertEqual(A.messages[0],
James E. Blairff80a2f2013-12-27 13:24:06 -08002884 self.smtp_messages[1]['body'])
James E. Blairad28e912013-11-27 10:43:22 -08002885
James E. Blaire5910202013-12-27 09:50:31 -08002886 def test_timer_smtp(self):
2887 "Test that a periodic job is triggered"
Paul Belanger174a8272017-03-14 13:20:10 -04002888 self.executor_server.hold_jobs_in_build = True
Clint Byrum7b71b2f2017-02-08 07:00:52 -08002889 self.updateConfigLayout('layout-timer-smtp')
James E. Blaire5910202013-12-27 09:50:31 -08002890 self.sched.reconfigure(self.config)
James E. Blaire5910202013-12-27 09:50:31 -08002891
Clark Boylan3ee090a2014-04-03 20:55:09 -07002892 # The pipeline triggers every second, so we should have seen
2893 # several by now.
2894 time.sleep(5)
James E. Blaire5910202013-12-27 09:50:31 -08002895 self.waitUntilSettled()
2896
Clark Boylan3ee090a2014-04-03 20:55:09 -07002897 self.assertEqual(len(self.builds), 2)
Paul Belanger174a8272017-03-14 13:20:10 -04002898 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002899 self.waitUntilSettled()
2900 self.assertEqual(len(self.history), 2)
2901
James E. Blaire5910202013-12-27 09:50:31 -08002902 self.assertEqual(self.getJobFromHistory(
2903 'project-bitrot-stable-old').result, 'SUCCESS')
2904 self.assertEqual(self.getJobFromHistory(
2905 'project-bitrot-stable-older').result, 'SUCCESS')
2906
James E. Blairff80a2f2013-12-27 13:24:06 -08002907 self.assertEqual(len(self.smtp_messages), 1)
James E. Blaire5910202013-12-27 09:50:31 -08002908
2909 # A.messages only holds what FakeGerrit places in it. Thus we
2910 # work on the knowledge of what the first message should be as
2911 # it is only configured to go to SMTP.
2912
2913 self.assertEqual('zuul_from@example.com',
James E. Blairff80a2f2013-12-27 13:24:06 -08002914 self.smtp_messages[0]['from_email'])
James E. Blaire5910202013-12-27 09:50:31 -08002915 self.assertEqual(['alternative_me@example.com'],
James E. Blairff80a2f2013-12-27 13:24:06 -08002916 self.smtp_messages[0]['to_email'])
James E. Blaire5910202013-12-27 09:50:31 -08002917 self.assertIn('Subject: Periodic check for org/project succeeded',
James E. Blairff80a2f2013-12-27 13:24:06 -08002918 self.smtp_messages[0]['headers'])
James E. Blaire5910202013-12-27 09:50:31 -08002919
Clark Boylan3ee090a2014-04-03 20:55:09 -07002920 # Stop queuing timer triggered jobs and let any that may have
2921 # queued through so that end of test assertions pass.
Clint Byrum7b71b2f2017-02-08 07:00:52 -08002922 self.commitLayoutUpdate('layout-timer-smtp', 'layout-no-timer')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002923 self.sched.reconfigure(self.config)
James E. Blairf8058972014-08-15 16:09:16 -07002924 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04002925 self.executor_server.release('.*')
Clark Boylan3ee090a2014-04-03 20:55:09 -07002926 self.waitUntilSettled()
2927
Joshua Hesketh25695cb2017-03-06 12:50:04 +11002928 @skip("Disabled for early v3 development")
Evgeny Antyshevda90a502017-02-08 08:42:59 +00002929 def test_timer_sshkey(self):
2930 "Test that a periodic job can setup SSH key authentication"
2931 self.worker.hold_jobs_in_build = True
2932 self.config.set('zuul', 'layout_config',
2933 'tests/fixtures/layout-timer.yaml')
2934 self.sched.reconfigure(self.config)
2935 self.registerJobs()
2936
2937 # The pipeline triggers every second, so we should have seen
2938 # several by now.
2939 time.sleep(5)
2940 self.waitUntilSettled()
2941
2942 self.assertEqual(len(self.builds), 2)
2943
2944 ssh_wrapper = os.path.join(self.git_root, ".ssh_wrapper_gerrit")
2945 self.assertTrue(os.path.isfile(ssh_wrapper))
2946 with open(ssh_wrapper) as f:
2947 ssh_wrapper_content = f.read()
2948 self.assertIn("fake_id_rsa", ssh_wrapper_content)
2949 # In the unit tests Merger runs in the same process,
2950 # so we see its' environment variables
2951 self.assertEqual(os.environ['GIT_SSH'], ssh_wrapper)
2952
2953 self.worker.release('.*')
2954 self.waitUntilSettled()
2955 self.assertEqual(len(self.history), 2)
2956
2957 self.assertEqual(self.getJobFromHistory(
2958 'project-bitrot-stable-old').result, 'SUCCESS')
2959 self.assertEqual(self.getJobFromHistory(
2960 'project-bitrot-stable-older').result, 'SUCCESS')
2961
2962 # Stop queuing timer triggered jobs and let any that may have
2963 # queued through so that end of test assertions pass.
2964 self.config.set('zuul', 'layout_config',
2965 'tests/fixtures/layout-no-timer.yaml')
2966 self.sched.reconfigure(self.config)
2967 self.registerJobs()
2968 self.waitUntilSettled()
2969 self.worker.release('.*')
2970 self.waitUntilSettled()
2971
James E. Blair91e34592015-07-31 16:45:59 -07002972 def test_client_enqueue_change(self):
James E. Blairad28e912013-11-27 10:43:22 -08002973 "Test that the RPC client can enqueue a change"
2974 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07002975 A.addApproval('code-review', 2)
2976 A.addApproval('approved', 1)
James E. Blairad28e912013-11-27 10:43:22 -08002977
2978 client = zuul.rpcclient.RPCClient('127.0.0.1',
2979 self.gearman_server.port)
Paul Belangerbaca3132016-11-04 12:49:54 -04002980 r = client.enqueue(tenant='tenant-one',
2981 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08002982 project='org/project',
2983 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08002984 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08002985 self.waitUntilSettled()
2986 self.assertEqual(self.getJobFromHistory('project-merge').result,
2987 'SUCCESS')
2988 self.assertEqual(self.getJobFromHistory('project-test1').result,
2989 'SUCCESS')
2990 self.assertEqual(self.getJobFromHistory('project-test2').result,
2991 'SUCCESS')
2992 self.assertEqual(A.data['status'], 'MERGED')
2993 self.assertEqual(A.reported, 2)
2994 self.assertEqual(r, True)
2995
James E. Blair91e34592015-07-31 16:45:59 -07002996 def test_client_enqueue_ref(self):
2997 "Test that the RPC client can enqueue a ref"
2998
2999 client = zuul.rpcclient.RPCClient('127.0.0.1',
3000 self.gearman_server.port)
3001 r = client.enqueue_ref(
Paul Belangerbaca3132016-11-04 12:49:54 -04003002 tenant='tenant-one',
James E. Blair91e34592015-07-31 16:45:59 -07003003 pipeline='post',
3004 project='org/project',
3005 trigger='gerrit',
3006 ref='master',
3007 oldrev='90f173846e3af9154517b88543ffbd1691f31366',
3008 newrev='d479a0bfcb34da57a31adb2a595c0cf687812543')
3009 self.waitUntilSettled()
3010 job_names = [x.name for x in self.history]
3011 self.assertEqual(len(self.history), 1)
3012 self.assertIn('project-post', job_names)
3013 self.assertEqual(r, True)
3014
James E. Blairad28e912013-11-27 10:43:22 -08003015 def test_client_enqueue_negative(self):
3016 "Test that the RPC client returns errors"
3017 client = zuul.rpcclient.RPCClient('127.0.0.1',
3018 self.gearman_server.port)
3019 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
Paul Belangerbaca3132016-11-04 12:49:54 -04003020 "Invalid tenant"):
3021 r = client.enqueue(tenant='tenant-foo',
3022 pipeline='gate',
3023 project='org/project',
3024 trigger='gerrit',
3025 change='1,1')
3026 client.shutdown()
3027 self.assertEqual(r, False)
3028
3029 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
James E. Blairad28e912013-11-27 10:43:22 -08003030 "Invalid project"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003031 r = client.enqueue(tenant='tenant-one',
3032 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003033 project='project-does-not-exist',
3034 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003035 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003036 client.shutdown()
3037 self.assertEqual(r, False)
3038
3039 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3040 "Invalid pipeline"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003041 r = client.enqueue(tenant='tenant-one',
3042 pipeline='pipeline-does-not-exist',
James E. Blairad28e912013-11-27 10:43:22 -08003043 project='org/project',
3044 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003045 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003046 client.shutdown()
3047 self.assertEqual(r, False)
3048
3049 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3050 "Invalid trigger"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003051 r = client.enqueue(tenant='tenant-one',
3052 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003053 project='org/project',
3054 trigger='trigger-does-not-exist',
James E. Blair36658cf2013-12-06 17:53:48 -08003055 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003056 client.shutdown()
3057 self.assertEqual(r, False)
3058
3059 with testtools.ExpectedException(zuul.rpcclient.RPCFailure,
3060 "Invalid change"):
Paul Belangerbaca3132016-11-04 12:49:54 -04003061 r = client.enqueue(tenant='tenant-one',
3062 pipeline='gate',
James E. Blairad28e912013-11-27 10:43:22 -08003063 project='org/project',
3064 trigger='gerrit',
James E. Blair36658cf2013-12-06 17:53:48 -08003065 change='1,1')
James E. Blairad28e912013-11-27 10:43:22 -08003066 client.shutdown()
3067 self.assertEqual(r, False)
3068
3069 self.waitUntilSettled()
3070 self.assertEqual(len(self.history), 0)
3071 self.assertEqual(len(self.builds), 0)
James E. Blair36658cf2013-12-06 17:53:48 -08003072
3073 def test_client_promote(self):
3074 "Test that the RPC client can promote a change"
Paul Belanger174a8272017-03-14 13:20:10 -04003075 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003076 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3077 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3078 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -07003079 A.addApproval('code-review', 2)
3080 B.addApproval('code-review', 2)
3081 C.addApproval('code-review', 2)
James E. Blair36658cf2013-12-06 17:53:48 -08003082
James E. Blair8b5408c2016-08-08 15:37:46 -07003083 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
3084 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
3085 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003086
3087 self.waitUntilSettled()
3088
Paul Belangerbaca3132016-11-04 12:49:54 -04003089 tenant = self.sched.abide.tenants.get('tenant-one')
3090 items = tenant.layout.pipelines['gate'].getAllItems()
Sean Daguef39b9ca2014-01-10 21:34:35 -05003091 enqueue_times = {}
3092 for item in items:
3093 enqueue_times[str(item.change)] = item.enqueue_time
3094
James E. Blair36658cf2013-12-06 17:53:48 -08003095 client = zuul.rpcclient.RPCClient('127.0.0.1',
3096 self.gearman_server.port)
Paul Belangerbaca3132016-11-04 12:49:54 -04003097 r = client.promote(tenant='tenant-one',
3098 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003099 change_ids=['2,1', '3,1'])
3100
Sean Daguef39b9ca2014-01-10 21:34:35 -05003101 # ensure that enqueue times are durable
Paul Belangerbaca3132016-11-04 12:49:54 -04003102 items = tenant.layout.pipelines['gate'].getAllItems()
Sean Daguef39b9ca2014-01-10 21:34:35 -05003103 for item in items:
3104 self.assertEqual(
3105 enqueue_times[str(item.change)], item.enqueue_time)
3106
James E. Blair78acec92014-02-06 07:11:32 -08003107 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003108 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003109 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003110 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003111 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003112 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003113 self.waitUntilSettled()
3114
3115 self.assertEqual(len(self.builds), 6)
3116 self.assertEqual(self.builds[0].name, 'project-test1')
3117 self.assertEqual(self.builds[1].name, 'project-test2')
3118 self.assertEqual(self.builds[2].name, 'project-test1')
3119 self.assertEqual(self.builds[3].name, 'project-test2')
3120 self.assertEqual(self.builds[4].name, 'project-test1')
3121 self.assertEqual(self.builds[5].name, 'project-test2')
3122
Paul Belangerbaca3132016-11-04 12:49:54 -04003123 self.assertTrue(self.builds[0].hasChanges(B))
3124 self.assertFalse(self.builds[0].hasChanges(A))
3125 self.assertFalse(self.builds[0].hasChanges(C))
James E. Blair36658cf2013-12-06 17:53:48 -08003126
Paul Belangerbaca3132016-11-04 12:49:54 -04003127 self.assertTrue(self.builds[2].hasChanges(B))
3128 self.assertTrue(self.builds[2].hasChanges(C))
3129 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003130
Paul Belangerbaca3132016-11-04 12:49:54 -04003131 self.assertTrue(self.builds[4].hasChanges(B))
3132 self.assertTrue(self.builds[4].hasChanges(C))
3133 self.assertTrue(self.builds[4].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003134
Paul Belanger174a8272017-03-14 13:20:10 -04003135 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003136 self.waitUntilSettled()
3137
3138 self.assertEqual(A.data['status'], 'MERGED')
3139 self.assertEqual(A.reported, 2)
3140 self.assertEqual(B.data['status'], 'MERGED')
3141 self.assertEqual(B.reported, 2)
3142 self.assertEqual(C.data['status'], 'MERGED')
3143 self.assertEqual(C.reported, 2)
3144
3145 client.shutdown()
3146 self.assertEqual(r, True)
3147
3148 def test_client_promote_dependent(self):
3149 "Test that the RPC client can promote a dependent change"
3150 # C (depends on B) -> B -> A ; then promote C to get:
3151 # A -> C (depends on B) -> B
Paul Belanger174a8272017-03-14 13:20:10 -04003152 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003153 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3154 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3155 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3156
3157 C.setDependsOn(B, 1)
3158
James E. Blair8b5408c2016-08-08 15:37:46 -07003159 A.addApproval('code-review', 2)
3160 B.addApproval('code-review', 2)
3161 C.addApproval('code-review', 2)
James E. Blair36658cf2013-12-06 17:53:48 -08003162
James E. Blair8b5408c2016-08-08 15:37:46 -07003163 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
3164 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
3165 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003166
3167 self.waitUntilSettled()
3168
3169 client = zuul.rpcclient.RPCClient('127.0.0.1',
3170 self.gearman_server.port)
Paul Belangerbaca3132016-11-04 12:49:54 -04003171 r = client.promote(tenant='tenant-one',
3172 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003173 change_ids=['3,1'])
3174
James E. Blair78acec92014-02-06 07:11:32 -08003175 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003176 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003177 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003178 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003179 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003180 self.executor_server.release('.*-merge')
James E. Blair36658cf2013-12-06 17:53:48 -08003181 self.waitUntilSettled()
3182
3183 self.assertEqual(len(self.builds), 6)
3184 self.assertEqual(self.builds[0].name, 'project-test1')
3185 self.assertEqual(self.builds[1].name, 'project-test2')
3186 self.assertEqual(self.builds[2].name, 'project-test1')
3187 self.assertEqual(self.builds[3].name, 'project-test2')
3188 self.assertEqual(self.builds[4].name, 'project-test1')
3189 self.assertEqual(self.builds[5].name, 'project-test2')
3190
Paul Belangerbaca3132016-11-04 12:49:54 -04003191 self.assertTrue(self.builds[0].hasChanges(B))
3192 self.assertFalse(self.builds[0].hasChanges(A))
3193 self.assertFalse(self.builds[0].hasChanges(C))
James E. Blair36658cf2013-12-06 17:53:48 -08003194
Paul Belangerbaca3132016-11-04 12:49:54 -04003195 self.assertTrue(self.builds[2].hasChanges(B))
3196 self.assertTrue(self.builds[2].hasChanges(C))
3197 self.assertFalse(self.builds[2].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003198
Paul Belangerbaca3132016-11-04 12:49:54 -04003199 self.assertTrue(self.builds[4].hasChanges(B))
3200 self.assertTrue(self.builds[4].hasChanges(C))
3201 self.assertTrue(self.builds[4].hasChanges(A))
James E. Blair36658cf2013-12-06 17:53:48 -08003202
Paul Belanger174a8272017-03-14 13:20:10 -04003203 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003204 self.waitUntilSettled()
3205
3206 self.assertEqual(A.data['status'], 'MERGED')
3207 self.assertEqual(A.reported, 2)
3208 self.assertEqual(B.data['status'], 'MERGED')
3209 self.assertEqual(B.reported, 2)
3210 self.assertEqual(C.data['status'], 'MERGED')
3211 self.assertEqual(C.reported, 2)
3212
3213 client.shutdown()
3214 self.assertEqual(r, True)
3215
3216 def test_client_promote_negative(self):
3217 "Test that the RPC client returns errors for promotion"
Paul Belanger174a8272017-03-14 13:20:10 -04003218 self.executor_server.hold_jobs_in_build = True
James E. Blair36658cf2013-12-06 17:53:48 -08003219 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07003220 A.addApproval('code-review', 2)
3221 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair36658cf2013-12-06 17:53:48 -08003222 self.waitUntilSettled()
3223
3224 client = zuul.rpcclient.RPCClient('127.0.0.1',
3225 self.gearman_server.port)
3226
3227 with testtools.ExpectedException(zuul.rpcclient.RPCFailure):
Paul Belangerbaca3132016-11-04 12:49:54 -04003228 r = client.promote(tenant='tenant-one',
3229 pipeline='nonexistent',
James E. Blair36658cf2013-12-06 17:53:48 -08003230 change_ids=['2,1', '3,1'])
3231 client.shutdown()
3232 self.assertEqual(r, False)
3233
3234 with testtools.ExpectedException(zuul.rpcclient.RPCFailure):
Paul Belangerbaca3132016-11-04 12:49:54 -04003235 r = client.promote(tenant='tenant-one',
3236 pipeline='gate',
James E. Blair36658cf2013-12-06 17:53:48 -08003237 change_ids=['4,1'])
3238 client.shutdown()
3239 self.assertEqual(r, False)
3240
Paul Belanger174a8272017-03-14 13:20:10 -04003241 self.executor_server.hold_jobs_in_build = False
3242 self.executor_server.release()
James E. Blair36658cf2013-12-06 17:53:48 -08003243 self.waitUntilSettled()
Clark Boylan7603a372014-01-21 11:43:20 -08003244
James E. Blairec056492016-07-22 09:45:56 -07003245 @skip("Disabled for early v3 development")
Clark Boylan7603a372014-01-21 11:43:20 -08003246 def test_queue_rate_limiting(self):
3247 "Test that DependentPipelines are rate limited with dep across window"
James E. Blairf84026c2015-12-08 16:11:46 -08003248 self.updateConfigLayout(
3249 'tests/fixtures/layout-rate-limit.yaml')
Clark Boylan7603a372014-01-21 11:43:20 -08003250 self.sched.reconfigure(self.config)
Paul Belanger174a8272017-03-14 13:20:10 -04003251 self.executor_server.hold_jobs_in_build = True
Clark Boylan7603a372014-01-21 11:43:20 -08003252 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3253 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3254 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3255
3256 C.setDependsOn(B, 1)
Paul Belanger174a8272017-03-14 13:20:10 -04003257 self.executor_server.failJob('project-test1', A)
Clark Boylan7603a372014-01-21 11:43:20 -08003258
James E. Blair8b5408c2016-08-08 15:37:46 -07003259 A.addApproval('code-review', 2)
3260 B.addApproval('code-review', 2)
3261 C.addApproval('code-review', 2)
Clark Boylan7603a372014-01-21 11:43:20 -08003262
James E. Blair8b5408c2016-08-08 15:37:46 -07003263 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
3264 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
3265 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
Clark Boylan7603a372014-01-21 11:43:20 -08003266 self.waitUntilSettled()
3267
3268 # Only A and B will have their merge jobs queued because
3269 # window is 2.
3270 self.assertEqual(len(self.builds), 2)
3271 self.assertEqual(self.builds[0].name, 'project-merge')
3272 self.assertEqual(self.builds[1].name, 'project-merge')
3273
Paul Belanger174a8272017-03-14 13:20:10 -04003274 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003275 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003276 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003277 self.waitUntilSettled()
3278
3279 # Only A and B will have their test jobs queued because
3280 # window is 2.
3281 self.assertEqual(len(self.builds), 4)
3282 self.assertEqual(self.builds[0].name, 'project-test1')
3283 self.assertEqual(self.builds[1].name, 'project-test2')
3284 self.assertEqual(self.builds[2].name, 'project-test1')
3285 self.assertEqual(self.builds[3].name, 'project-test2')
3286
Paul Belanger174a8272017-03-14 13:20:10 -04003287 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003288 self.waitUntilSettled()
3289
3290 queue = self.sched.layout.pipelines['gate'].queues[0]
3291 # A failed so window is reduced by 1 to 1.
3292 self.assertEqual(queue.window, 1)
3293 self.assertEqual(queue.window_floor, 1)
3294 self.assertEqual(A.data['status'], 'NEW')
3295
3296 # Gate is reset and only B's merge job is queued because
3297 # window shrunk to 1.
3298 self.assertEqual(len(self.builds), 1)
3299 self.assertEqual(self.builds[0].name, 'project-merge')
3300
Paul Belanger174a8272017-03-14 13:20:10 -04003301 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003302 self.waitUntilSettled()
3303
3304 # Only B's test jobs are queued because window is still 1.
3305 self.assertEqual(len(self.builds), 2)
3306 self.assertEqual(self.builds[0].name, 'project-test1')
3307 self.assertEqual(self.builds[1].name, 'project-test2')
3308
Paul Belanger174a8272017-03-14 13:20:10 -04003309 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003310 self.waitUntilSettled()
3311
3312 # B was successfully merged so window is increased to 2.
3313 self.assertEqual(queue.window, 2)
3314 self.assertEqual(queue.window_floor, 1)
3315 self.assertEqual(B.data['status'], 'MERGED')
3316
3317 # Only C is left and its merge job is queued.
3318 self.assertEqual(len(self.builds), 1)
3319 self.assertEqual(self.builds[0].name, 'project-merge')
3320
Paul Belanger174a8272017-03-14 13:20:10 -04003321 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003322 self.waitUntilSettled()
3323
3324 # After successful merge job the test jobs for C are queued.
3325 self.assertEqual(len(self.builds), 2)
3326 self.assertEqual(self.builds[0].name, 'project-test1')
3327 self.assertEqual(self.builds[1].name, 'project-test2')
3328
Paul Belanger174a8272017-03-14 13:20:10 -04003329 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003330 self.waitUntilSettled()
3331
3332 # C successfully merged so window is bumped to 3.
3333 self.assertEqual(queue.window, 3)
3334 self.assertEqual(queue.window_floor, 1)
3335 self.assertEqual(C.data['status'], 'MERGED')
3336
James E. Blairec056492016-07-22 09:45:56 -07003337 @skip("Disabled for early v3 development")
Clark Boylan7603a372014-01-21 11:43:20 -08003338 def test_queue_rate_limiting_dependent(self):
3339 "Test that DependentPipelines are rate limited with dep in window"
James E. Blairf84026c2015-12-08 16:11:46 -08003340 self.updateConfigLayout(
3341 'tests/fixtures/layout-rate-limit.yaml')
Clark Boylan7603a372014-01-21 11:43:20 -08003342 self.sched.reconfigure(self.config)
Paul Belanger174a8272017-03-14 13:20:10 -04003343 self.executor_server.hold_jobs_in_build = True
Clark Boylan7603a372014-01-21 11:43:20 -08003344 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3345 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3346 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3347
3348 B.setDependsOn(A, 1)
3349
Paul Belanger174a8272017-03-14 13:20:10 -04003350 self.executor_server.failJob('project-test1', A)
Clark Boylan7603a372014-01-21 11:43:20 -08003351
James E. Blair8b5408c2016-08-08 15:37:46 -07003352 A.addApproval('code-review', 2)
3353 B.addApproval('code-review', 2)
3354 C.addApproval('code-review', 2)
Clark Boylan7603a372014-01-21 11:43:20 -08003355
James E. Blair8b5408c2016-08-08 15:37:46 -07003356 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
3357 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
3358 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
Clark Boylan7603a372014-01-21 11:43:20 -08003359 self.waitUntilSettled()
3360
3361 # Only A and B will have their merge jobs queued because
3362 # window is 2.
3363 self.assertEqual(len(self.builds), 2)
3364 self.assertEqual(self.builds[0].name, 'project-merge')
3365 self.assertEqual(self.builds[1].name, 'project-merge')
3366
Paul Belanger174a8272017-03-14 13:20:10 -04003367 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003368 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003369 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003370 self.waitUntilSettled()
3371
3372 # Only A and B will have their test jobs queued because
3373 # window is 2.
3374 self.assertEqual(len(self.builds), 4)
3375 self.assertEqual(self.builds[0].name, 'project-test1')
3376 self.assertEqual(self.builds[1].name, 'project-test2')
3377 self.assertEqual(self.builds[2].name, 'project-test1')
3378 self.assertEqual(self.builds[3].name, 'project-test2')
3379
Paul Belanger174a8272017-03-14 13:20:10 -04003380 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003381 self.waitUntilSettled()
3382
3383 queue = self.sched.layout.pipelines['gate'].queues[0]
3384 # A failed so window is reduced by 1 to 1.
3385 self.assertEqual(queue.window, 1)
3386 self.assertEqual(queue.window_floor, 1)
3387 self.assertEqual(A.data['status'], 'NEW')
3388 self.assertEqual(B.data['status'], 'NEW')
3389
3390 # Gate is reset and only C's merge job is queued because
3391 # window shrunk to 1 and A and B were dequeued.
3392 self.assertEqual(len(self.builds), 1)
3393 self.assertEqual(self.builds[0].name, 'project-merge')
3394
Paul Belanger174a8272017-03-14 13:20:10 -04003395 self.executor_server.release('.*-merge')
Clark Boylan7603a372014-01-21 11:43:20 -08003396 self.waitUntilSettled()
3397
3398 # Only C's test jobs are queued because window is still 1.
3399 self.assertEqual(len(self.builds), 2)
3400 self.assertEqual(self.builds[0].name, 'project-test1')
3401 self.assertEqual(self.builds[1].name, 'project-test2')
3402
Paul Belanger174a8272017-03-14 13:20:10 -04003403 self.executor_server.release('project-.*')
Clark Boylan7603a372014-01-21 11:43:20 -08003404 self.waitUntilSettled()
3405
3406 # C was successfully merged so window is increased to 2.
3407 self.assertEqual(queue.window, 2)
3408 self.assertEqual(queue.window_floor, 1)
3409 self.assertEqual(C.data['status'], 'MERGED')
Joshua Heskethba8776a2014-01-12 14:35:40 +08003410
James E. Blairec056492016-07-22 09:45:56 -07003411 @skip("Disabled for early v3 development")
Joshua Heskethba8776a2014-01-12 14:35:40 +08003412 def test_worker_update_metadata(self):
3413 "Test if a worker can send back metadata about itself"
Paul Belanger174a8272017-03-14 13:20:10 -04003414 self.executor_server.hold_jobs_in_build = True
Joshua Heskethba8776a2014-01-12 14:35:40 +08003415
3416 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07003417 A.addApproval('code-review', 2)
3418 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Joshua Heskethba8776a2014-01-12 14:35:40 +08003419 self.waitUntilSettled()
3420
Paul Belanger174a8272017-03-14 13:20:10 -04003421 self.assertEqual(len(self.executor.builds), 1)
Joshua Heskethba8776a2014-01-12 14:35:40 +08003422
3423 self.log.debug('Current builds:')
Paul Belanger174a8272017-03-14 13:20:10 -04003424 self.log.debug(self.executor.builds)
Joshua Heskethba8776a2014-01-12 14:35:40 +08003425
3426 start = time.time()
3427 while True:
3428 if time.time() - start > 10:
3429 raise Exception("Timeout waiting for gearman server to report "
3430 + "back to the client")
Paul Belanger174a8272017-03-14 13:20:10 -04003431 build = self.executor.builds.values()[0]
Joshua Heskethba8776a2014-01-12 14:35:40 +08003432 if build.worker.name == "My Worker":
3433 break
3434 else:
3435 time.sleep(0)
3436
3437 self.log.debug(build)
3438 self.assertEqual("My Worker", build.worker.name)
3439 self.assertEqual("localhost", build.worker.hostname)
3440 self.assertEqual(['127.0.0.1', '192.168.1.1'], build.worker.ips)
3441 self.assertEqual("zuul.example.org", build.worker.fqdn)
3442 self.assertEqual("FakeBuilder", build.worker.program)
3443 self.assertEqual("v1.1", build.worker.version)
3444 self.assertEqual({'something': 'else'}, build.worker.extra)
3445
Paul Belanger174a8272017-03-14 13:20:10 -04003446 self.executor_server.hold_jobs_in_build = False
3447 self.executor_server.release()
Joshua Heskethba8776a2014-01-12 14:35:40 +08003448 self.waitUntilSettled()
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003449
3450 def test_footer_message(self):
3451 "Test a pipeline's footer message is correctly added to the report."
Adam Gandelman82258fd2017-02-07 16:51:58 -08003452 self.updateConfigLayout('layout-footer-message')
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003453 self.sched.reconfigure(self.config)
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003454
3455 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07003456 A.addApproval('code-review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04003457 self.executor_server.failJob('project-test1', A)
James E. Blair8b5408c2016-08-08 15:37:46 -07003458 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003459 self.waitUntilSettled()
3460
3461 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003462 B.addApproval('code-review', 2)
3463 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003464 self.waitUntilSettled()
3465
3466 self.assertEqual(2, len(self.smtp_messages))
3467
Adam Gandelman82258fd2017-02-07 16:51:58 -08003468 failure_msg = """\
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003469Build failed. For information on how to proceed, see \
Adam Gandelman82258fd2017-02-07 16:51:58 -08003470http://wiki.example.org/Test_Failures"""
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003471
Adam Gandelman82258fd2017-02-07 16:51:58 -08003472 footer_msg = """\
Joshua Hesketh3979e3e2014-03-04 11:21:10 +11003473For CI problems and help debugging, contact ci@example.org"""
3474
Adam Gandelman82258fd2017-02-07 16:51:58 -08003475 self.assertTrue(self.smtp_messages[0]['body'].startswith(failure_msg))
3476 self.assertTrue(self.smtp_messages[0]['body'].endswith(footer_msg))
3477 self.assertFalse(self.smtp_messages[1]['body'].startswith(failure_msg))
3478 self.assertTrue(self.smtp_messages[1]['body'].endswith(footer_msg))
Joshua Heskethb7179772014-01-30 23:30:46 +11003479
James E. Blairec056492016-07-22 09:45:56 -07003480 @skip("Disabled for early v3 development")
Joshua Heskethb7179772014-01-30 23:30:46 +11003481 def test_merge_failure_reporters(self):
3482 """Check that the config is set up correctly"""
3483
James E. Blairf84026c2015-12-08 16:11:46 -08003484 self.updateConfigLayout(
3485 'tests/fixtures/layout-merge-failure.yaml')
Joshua Heskethb7179772014-01-30 23:30:46 +11003486 self.sched.reconfigure(self.config)
3487 self.registerJobs()
3488
3489 self.assertEqual(
Jeremy Stanley1c2c3c22015-06-15 21:23:19 +00003490 "Merge Failed.\n\nThis change or one of its cross-repo "
3491 "dependencies was unable to be automatically merged with the "
3492 "current state of its repository. Please rebase the change and "
3493 "upload a new patchset.",
Joshua Heskethb7179772014-01-30 23:30:46 +11003494 self.sched.layout.pipelines['check'].merge_failure_message)
3495 self.assertEqual(
3496 "The merge failed! For more information...",
3497 self.sched.layout.pipelines['gate'].merge_failure_message)
3498
3499 self.assertEqual(
3500 len(self.sched.layout.pipelines['check'].merge_failure_actions), 1)
3501 self.assertEqual(
3502 len(self.sched.layout.pipelines['gate'].merge_failure_actions), 2)
3503
3504 self.assertTrue(isinstance(
Joshua Heskethde958652015-11-10 19:19:50 +11003505 self.sched.layout.pipelines['check'].merge_failure_actions[0],
3506 zuul.reporter.gerrit.GerritReporter))
Joshua Heskethb7179772014-01-30 23:30:46 +11003507
3508 self.assertTrue(
3509 (
3510 isinstance(self.sched.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003511 merge_failure_actions[0],
Joshua Heskethffe42062014-09-05 21:43:52 +10003512 zuul.reporter.smtp.SMTPReporter) and
Joshua Heskethb7179772014-01-30 23:30:46 +11003513 isinstance(self.sched.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003514 merge_failure_actions[1],
Joshua Heskethffe42062014-09-05 21:43:52 +10003515 zuul.reporter.gerrit.GerritReporter)
Joshua Heskethb7179772014-01-30 23:30:46 +11003516 ) or (
3517 isinstance(self.sched.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003518 merge_failure_actions[0],
Joshua Heskethffe42062014-09-05 21:43:52 +10003519 zuul.reporter.gerrit.GerritReporter) and
Joshua Heskethb7179772014-01-30 23:30:46 +11003520 isinstance(self.sched.layout.pipelines['gate'].
Joshua Heskethde958652015-11-10 19:19:50 +11003521 merge_failure_actions[1],
Joshua Heskethffe42062014-09-05 21:43:52 +10003522 zuul.reporter.smtp.SMTPReporter)
Joshua Heskethb7179772014-01-30 23:30:46 +11003523 )
3524 )
3525
James E. Blairec056492016-07-22 09:45:56 -07003526 @skip("Disabled for early v3 development")
Joshua Heskethb7179772014-01-30 23:30:46 +11003527 def test_merge_failure_reports(self):
3528 """Check that when a change fails to merge the correct message is sent
3529 to the correct reporter"""
James E. Blairf84026c2015-12-08 16:11:46 -08003530 self.updateConfigLayout(
3531 'tests/fixtures/layout-merge-failure.yaml')
Joshua Heskethb7179772014-01-30 23:30:46 +11003532 self.sched.reconfigure(self.config)
3533 self.registerJobs()
3534
3535 # Check a test failure isn't reported to SMTP
3536 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07003537 A.addApproval('code-review', 2)
Paul Belanger174a8272017-03-14 13:20:10 -04003538 self.executor_server.failJob('project-test1', A)
James E. Blair8b5408c2016-08-08 15:37:46 -07003539 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Joshua Heskethb7179772014-01-30 23:30:46 +11003540 self.waitUntilSettled()
3541
3542 self.assertEqual(3, len(self.history)) # 3 jobs
3543 self.assertEqual(0, len(self.smtp_messages))
3544
3545 # Check a merge failure is reported to SMTP
3546 # B should be merged, but C will conflict with B
3547 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3548 B.addPatchset(['conflict'])
3549 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
3550 C.addPatchset(['conflict'])
James E. Blair8b5408c2016-08-08 15:37:46 -07003551 B.addApproval('code-review', 2)
3552 C.addApproval('code-review', 2)
3553 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
3554 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
Joshua Heskethb7179772014-01-30 23:30:46 +11003555 self.waitUntilSettled()
3556
3557 self.assertEqual(6, len(self.history)) # A and B jobs
3558 self.assertEqual(1, len(self.smtp_messages))
3559 self.assertEqual('The merge failed! For more information...',
3560 self.smtp_messages[0]['body'])
Joshua Hesketh36c3fa52014-01-22 11:40:52 +11003561
James E. Blairec056492016-07-22 09:45:56 -07003562 @skip("Disabled for early v3 development")
James E. Blairf760f0e2016-02-09 08:44:52 -08003563 def test_default_merge_failure_reports(self):
3564 """Check that the default merge failure reports are correct."""
3565
3566 # A should report success, B should report merge failure.
3567 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3568 A.addPatchset(['conflict'])
3569 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
3570 B.addPatchset(['conflict'])
James E. Blair8b5408c2016-08-08 15:37:46 -07003571 A.addApproval('code-review', 2)
3572 B.addApproval('code-review', 2)
3573 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
3574 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blairf760f0e2016-02-09 08:44:52 -08003575 self.waitUntilSettled()
3576
3577 self.assertEqual(3, len(self.history)) # A jobs
3578 self.assertEqual(A.reported, 2)
3579 self.assertEqual(B.reported, 2)
3580 self.assertEqual(A.data['status'], 'MERGED')
3581 self.assertEqual(B.data['status'], 'NEW')
3582 self.assertIn('Build succeeded', A.messages[1])
3583 self.assertIn('Merge Failed', B.messages[1])
3584 self.assertIn('automatically merged', B.messages[1])
3585 self.assertNotIn('logs.example.com', B.messages[1])
3586 self.assertNotIn('SKIPPED', B.messages[1])
3587
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003588 def test_client_get_running_jobs(self):
3589 "Test that the RPC client can get a list of running jobs"
Paul Belanger174a8272017-03-14 13:20:10 -04003590 self.executor_server.hold_jobs_in_build = True
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003591 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
James E. Blair8b5408c2016-08-08 15:37:46 -07003592 A.addApproval('code-review', 2)
3593 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003594 self.waitUntilSettled()
3595
3596 client = zuul.rpcclient.RPCClient('127.0.0.1',
3597 self.gearman_server.port)
3598
3599 # Wait for gearman server to send the initial workData back to zuul
3600 start = time.time()
3601 while True:
3602 if time.time() - start > 10:
3603 raise Exception("Timeout waiting for gearman server to report "
3604 + "back to the client")
Paul Belanger174a8272017-03-14 13:20:10 -04003605 build = self.executor_client.builds.values()[0]
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003606 if build.worker.name == "My Worker":
3607 break
3608 else:
3609 time.sleep(0)
3610
3611 running_items = client.get_running_jobs()
3612
3613 self.assertEqual(1, len(running_items))
3614 running_item = running_items[0]
3615 self.assertEqual([], running_item['failing_reasons'])
3616 self.assertEqual([], running_item['items_behind'])
3617 self.assertEqual('https://hostname/1', running_item['url'])
3618 self.assertEqual(None, running_item['item_ahead'])
3619 self.assertEqual('org/project', running_item['project'])
3620 self.assertEqual(None, running_item['remaining_time'])
3621 self.assertEqual(True, running_item['active'])
3622 self.assertEqual('1,1', running_item['id'])
3623
3624 self.assertEqual(3, len(running_item['jobs']))
3625 for job in running_item['jobs']:
3626 if job['name'] == 'project-merge':
3627 self.assertEqual('project-merge', job['name'])
3628 self.assertEqual('gate', job['pipeline'])
3629 self.assertEqual(False, job['retry'])
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003630 self.assertEqual('https://server/job/project-merge/0/',
3631 job['url'])
3632 self.assertEqual(7, len(job['worker']))
3633 self.assertEqual(False, job['canceled'])
3634 self.assertEqual(True, job['voting'])
3635 self.assertEqual(None, job['result'])
3636 self.assertEqual('gate', job['pipeline'])
3637 break
3638
Paul Belanger174a8272017-03-14 13:20:10 -04003639 self.executor_server.hold_jobs_in_build = False
3640 self.executor_server.release()
Joshua Hesketh85af4e92014-02-21 08:28:58 -08003641 self.waitUntilSettled()
3642
3643 running_items = client.get_running_jobs()
3644 self.assertEqual(0, len(running_items))
James E. Blairbadc1ad2014-04-28 13:55:14 -07003645
3646 def test_nonvoting_pipeline(self):
3647 "Test that a nonvoting pipeline (experimental) can still report"
3648
Joshua Heskethcc017ea2014-04-30 19:55:25 +10003649 A = self.fake_gerrit.addFakeChange('org/experimental-project',
3650 'master', 'A')
James E. Blairbadc1ad2014-04-28 13:55:14 -07003651 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3652 self.waitUntilSettled()
Paul Belanger15e3e202016-10-14 16:27:34 -04003653
3654 self.assertEqual(self.getJobFromHistory('project-merge').result,
3655 'SUCCESS')
Joshua Heskethcc017ea2014-04-30 19:55:25 +10003656 self.assertEqual(
3657 self.getJobFromHistory('experimental-project-test').result,
3658 'SUCCESS')
James E. Blairbadc1ad2014-04-28 13:55:14 -07003659 self.assertEqual(A.reported, 1)
James E. Blair5ee24252014-12-30 10:12:29 -08003660
3661 def test_crd_gate(self):
3662 "Test cross-repo dependencies"
3663 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3664 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003665 A.addApproval('code-review', 2)
3666 B.addApproval('code-review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08003667
3668 AM2 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM2')
3669 AM1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM1')
3670 AM2.setMerged()
3671 AM1.setMerged()
3672
3673 BM2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM2')
3674 BM1 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM1')
3675 BM2.setMerged()
3676 BM1.setMerged()
3677
3678 # A -> AM1 -> AM2
3679 # B -> BM1 -> BM2
3680 # A Depends-On: B
3681 # M2 is here to make sure it is never queried. If it is, it
3682 # means zuul is walking down the entire history of merged
3683 # changes.
3684
3685 B.setDependsOn(BM1, 1)
3686 BM1.setDependsOn(BM2, 1)
3687
3688 A.setDependsOn(AM1, 1)
3689 AM1.setDependsOn(AM2, 1)
3690
3691 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3692 A.subject, B.data['id'])
3693
James E. Blair8b5408c2016-08-08 15:37:46 -07003694 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003695 self.waitUntilSettled()
3696
3697 self.assertEqual(A.data['status'], 'NEW')
3698 self.assertEqual(B.data['status'], 'NEW')
3699
Paul Belanger5dccbe72016-11-14 11:17:37 -05003700 for connection in self.connections.connections.values():
Joshua Hesketh4bd7da32016-02-17 20:58:47 +11003701 connection.maintainCache([])
James E. Blair5ee24252014-12-30 10:12:29 -08003702
Paul Belanger174a8272017-03-14 13:20:10 -04003703 self.executor_server.hold_jobs_in_build = True
James E. Blair8b5408c2016-08-08 15:37:46 -07003704 B.addApproval('approved', 1)
3705 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003706 self.waitUntilSettled()
3707
Paul Belanger174a8272017-03-14 13:20:10 -04003708 self.executor_server.release('.*-merge')
James E. Blair5ee24252014-12-30 10:12:29 -08003709 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003710 self.executor_server.release('.*-merge')
James E. Blair5ee24252014-12-30 10:12:29 -08003711 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003712 self.executor_server.hold_jobs_in_build = False
3713 self.executor_server.release()
James E. Blair5ee24252014-12-30 10:12:29 -08003714 self.waitUntilSettled()
3715
3716 self.assertEqual(AM2.queried, 0)
3717 self.assertEqual(BM2.queried, 0)
3718 self.assertEqual(A.data['status'], 'MERGED')
3719 self.assertEqual(B.data['status'], 'MERGED')
3720 self.assertEqual(A.reported, 2)
3721 self.assertEqual(B.reported, 2)
3722
Paul Belanger5dccbe72016-11-14 11:17:37 -05003723 changes = self.getJobFromHistory(
3724 'project-merge', 'org/project1').changes
3725 self.assertEqual(changes, '2,1 1,1')
James E. Blair8f78d882015-02-05 08:51:37 -08003726
3727 def test_crd_branch(self):
3728 "Test cross-repo dependencies in multiple branches"
Paul Belanger6379db12016-11-14 13:57:54 -05003729
3730 self.create_branch('org/project2', 'mp')
James E. Blair8f78d882015-02-05 08:51:37 -08003731 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3732 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
3733 C = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C')
3734 C.data['id'] = B.data['id']
James E. Blair8b5408c2016-08-08 15:37:46 -07003735 A.addApproval('code-review', 2)
3736 B.addApproval('code-review', 2)
3737 C.addApproval('code-review', 2)
James E. Blair8f78d882015-02-05 08:51:37 -08003738
3739 # A Depends-On: B+C
3740 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3741 A.subject, B.data['id'])
3742
Paul Belanger174a8272017-03-14 13:20:10 -04003743 self.executor_server.hold_jobs_in_build = True
James E. Blair8b5408c2016-08-08 15:37:46 -07003744 B.addApproval('approved', 1)
3745 C.addApproval('approved', 1)
3746 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair8f78d882015-02-05 08:51:37 -08003747 self.waitUntilSettled()
3748
Paul Belanger174a8272017-03-14 13:20:10 -04003749 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003750 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003751 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003752 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003753 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003754 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003755 self.executor_server.hold_jobs_in_build = False
3756 self.executor_server.release()
James E. Blair8f78d882015-02-05 08:51:37 -08003757 self.waitUntilSettled()
3758
3759 self.assertEqual(A.data['status'], 'MERGED')
3760 self.assertEqual(B.data['status'], 'MERGED')
3761 self.assertEqual(C.data['status'], 'MERGED')
3762 self.assertEqual(A.reported, 2)
3763 self.assertEqual(B.reported, 2)
3764 self.assertEqual(C.reported, 2)
3765
Paul Belanger6379db12016-11-14 13:57:54 -05003766 changes = self.getJobFromHistory(
3767 'project-merge', 'org/project1').changes
3768 self.assertEqual(changes, '2,1 3,1 1,1')
James E. Blair8f78d882015-02-05 08:51:37 -08003769
3770 def test_crd_multiline(self):
3771 "Test multiple depends-on lines in commit"
3772 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3773 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
3774 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
James E. Blair8b5408c2016-08-08 15:37:46 -07003775 A.addApproval('code-review', 2)
3776 B.addApproval('code-review', 2)
3777 C.addApproval('code-review', 2)
James E. Blair8f78d882015-02-05 08:51:37 -08003778
3779 # A Depends-On: B+C
3780 A.data['commitMessage'] = '%s\n\nDepends-On: %s\nDepends-On: %s\n' % (
3781 A.subject, B.data['id'], C.data['id'])
3782
Paul Belanger174a8272017-03-14 13:20:10 -04003783 self.executor_server.hold_jobs_in_build = True
James E. Blair8b5408c2016-08-08 15:37:46 -07003784 B.addApproval('approved', 1)
3785 C.addApproval('approved', 1)
3786 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair8f78d882015-02-05 08:51:37 -08003787 self.waitUntilSettled()
3788
Paul Belanger174a8272017-03-14 13:20:10 -04003789 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003790 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003791 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003792 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003793 self.executor_server.release('.*-merge')
James E. Blair8f78d882015-02-05 08:51:37 -08003794 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003795 self.executor_server.hold_jobs_in_build = False
3796 self.executor_server.release()
James E. Blair8f78d882015-02-05 08:51:37 -08003797 self.waitUntilSettled()
3798
3799 self.assertEqual(A.data['status'], 'MERGED')
3800 self.assertEqual(B.data['status'], 'MERGED')
3801 self.assertEqual(C.data['status'], 'MERGED')
3802 self.assertEqual(A.reported, 2)
3803 self.assertEqual(B.reported, 2)
3804 self.assertEqual(C.reported, 2)
3805
Paul Belanger5dccbe72016-11-14 11:17:37 -05003806 changes = self.getJobFromHistory(
3807 'project-merge', 'org/project1').changes
3808 self.assertEqual(changes, '2,1 3,1 1,1')
James E. Blair5ee24252014-12-30 10:12:29 -08003809
3810 def test_crd_unshared_gate(self):
3811 "Test cross-repo dependencies in unshared gate queues"
3812 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3813 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003814 A.addApproval('code-review', 2)
3815 B.addApproval('code-review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08003816
3817 # A Depends-On: B
3818 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3819 A.subject, B.data['id'])
3820
3821 # A and B do not share a queue, make sure that A is unable to
3822 # enqueue B (and therefore, A is unable to be enqueued).
James E. Blair8b5408c2016-08-08 15:37:46 -07003823 B.addApproval('approved', 1)
3824 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003825 self.waitUntilSettled()
3826
3827 self.assertEqual(A.data['status'], 'NEW')
3828 self.assertEqual(B.data['status'], 'NEW')
3829 self.assertEqual(A.reported, 0)
3830 self.assertEqual(B.reported, 0)
3831 self.assertEqual(len(self.history), 0)
3832
3833 # Enqueue and merge B alone.
James E. Blair8b5408c2016-08-08 15:37:46 -07003834 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003835 self.waitUntilSettled()
3836
3837 self.assertEqual(B.data['status'], 'MERGED')
3838 self.assertEqual(B.reported, 2)
3839
3840 # Now that B is merged, A should be able to be enqueued and
3841 # merged.
James E. Blair8b5408c2016-08-08 15:37:46 -07003842 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003843 self.waitUntilSettled()
3844
3845 self.assertEqual(A.data['status'], 'MERGED')
3846 self.assertEqual(A.reported, 2)
3847
James E. Blair96698e22015-04-02 07:48:21 -07003848 def test_crd_gate_reverse(self):
3849 "Test reverse cross-repo dependencies"
3850 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3851 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003852 A.addApproval('code-review', 2)
3853 B.addApproval('code-review', 2)
James E. Blair96698e22015-04-02 07:48:21 -07003854
3855 # A Depends-On: B
3856
3857 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3858 A.subject, B.data['id'])
3859
James E. Blair8b5408c2016-08-08 15:37:46 -07003860 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair96698e22015-04-02 07:48:21 -07003861 self.waitUntilSettled()
3862
3863 self.assertEqual(A.data['status'], 'NEW')
3864 self.assertEqual(B.data['status'], 'NEW')
3865
Paul Belanger174a8272017-03-14 13:20:10 -04003866 self.executor_server.hold_jobs_in_build = True
James E. Blair8b5408c2016-08-08 15:37:46 -07003867 A.addApproval('approved', 1)
3868 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
James E. Blair96698e22015-04-02 07:48:21 -07003869 self.waitUntilSettled()
3870
Paul Belanger174a8272017-03-14 13:20:10 -04003871 self.executor_server.release('.*-merge')
James E. Blair96698e22015-04-02 07:48:21 -07003872 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003873 self.executor_server.release('.*-merge')
James E. Blair96698e22015-04-02 07:48:21 -07003874 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04003875 self.executor_server.hold_jobs_in_build = False
3876 self.executor_server.release()
James E. Blair96698e22015-04-02 07:48:21 -07003877 self.waitUntilSettled()
3878
3879 self.assertEqual(A.data['status'], 'MERGED')
3880 self.assertEqual(B.data['status'], 'MERGED')
3881 self.assertEqual(A.reported, 2)
3882 self.assertEqual(B.reported, 2)
3883
Paul Belanger5dccbe72016-11-14 11:17:37 -05003884 changes = self.getJobFromHistory(
3885 'project-merge', 'org/project1').changes
3886 self.assertEqual(changes, '2,1 1,1')
James E. Blair96698e22015-04-02 07:48:21 -07003887
James E. Blair5ee24252014-12-30 10:12:29 -08003888 def test_crd_cycle(self):
3889 "Test cross-repo dependency cycles"
3890 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3891 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003892 A.addApproval('code-review', 2)
3893 B.addApproval('code-review', 2)
James E. Blair5ee24252014-12-30 10:12:29 -08003894
3895 # A -> B -> A (via commit-depends)
3896
3897 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3898 A.subject, B.data['id'])
3899 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3900 B.subject, A.data['id'])
3901
James E. Blair8b5408c2016-08-08 15:37:46 -07003902 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
James E. Blair5ee24252014-12-30 10:12:29 -08003903 self.waitUntilSettled()
3904
3905 self.assertEqual(A.reported, 0)
3906 self.assertEqual(B.reported, 0)
3907 self.assertEqual(A.data['status'], 'NEW')
3908 self.assertEqual(B.data['status'], 'NEW')
James E. Blairbfb8e042014-12-30 17:01:44 -08003909
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00003910 def test_crd_gate_unknown(self):
3911 "Test unknown projects in dependent pipeline"
3912 self.init_repo("org/unknown")
3913 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
3914 B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'B')
James E. Blair8b5408c2016-08-08 15:37:46 -07003915 A.addApproval('code-review', 2)
3916 B.addApproval('code-review', 2)
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00003917
3918 # A Depends-On: B
3919 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3920 A.subject, B.data['id'])
3921
James E. Blair8b5408c2016-08-08 15:37:46 -07003922 B.addApproval('approved', 1)
3923 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00003924 self.waitUntilSettled()
3925
3926 # Unknown projects cannot share a queue with any other
3927 # since they don't have common jobs with any other (they have no jobs).
3928 # Changes which depend on unknown project changes
3929 # should not be processed in dependent pipeline
3930 self.assertEqual(A.data['status'], 'NEW')
3931 self.assertEqual(B.data['status'], 'NEW')
3932 self.assertEqual(A.reported, 0)
3933 self.assertEqual(B.reported, 0)
3934 self.assertEqual(len(self.history), 0)
3935
3936 # Simulate change B being gated outside this layout
James E. Blair8b5408c2016-08-08 15:37:46 -07003937 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00003938 B.setMerged()
3939 self.waitUntilSettled()
3940 self.assertEqual(len(self.history), 0)
3941
3942 # Now that B is merged, A should be able to be enqueued and
3943 # merged.
James E. Blair8b5408c2016-08-08 15:37:46 -07003944 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00003945 self.waitUntilSettled()
3946
3947 self.assertEqual(A.data['status'], 'MERGED')
3948 self.assertEqual(A.reported, 2)
3949 self.assertEqual(B.data['status'], 'MERGED')
3950 self.assertEqual(B.reported, 0)
3951
James E. Blairbfb8e042014-12-30 17:01:44 -08003952 def test_crd_check(self):
3953 "Test cross-repo dependencies in independent pipelines"
3954
Paul Belanger174a8272017-03-14 13:20:10 -04003955 self.executor_server.hold_jobs_in_build = True
James E. Blairbfb8e042014-12-30 17:01:44 -08003956 self.gearman_server.hold_jobs_in_queue = True
3957 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
3958 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
3959
3960 # A Depends-On: B
3961 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
3962 A.subject, B.data['id'])
3963
3964 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
3965 self.waitUntilSettled()
3966
3967 queue = self.gearman_server.getQueue()
3968 ref = self.getParameter(queue[-1], 'ZUUL_REF')
3969 self.gearman_server.hold_jobs_in_queue = False
3970 self.gearman_server.release()
3971 self.waitUntilSettled()
3972
Paul Belanger174a8272017-03-14 13:20:10 -04003973 self.executor_server.release('.*-merge')
Paul Belangerb30342b2016-11-14 12:30:43 -05003974 self.waitUntilSettled()
3975
Monty Taylord642d852017-02-23 14:05:42 -05003976 path = os.path.join(self.builds[0].jobdir.src_root, "org/project1")
James E. Blairbfb8e042014-12-30 17:01:44 -08003977 repo = git.Repo(path)
3978 repo_messages = [c.message.strip() for c in repo.iter_commits(ref)]
3979 repo_messages.reverse()
Paul Belangerb30342b2016-11-14 12:30:43 -05003980 correct_messages = [
3981 'initial commit', 'add content from fixture', 'A-1']
James E. Blairbfb8e042014-12-30 17:01:44 -08003982 self.assertEqual(repo_messages, correct_messages)
3983
Monty Taylord642d852017-02-23 14:05:42 -05003984 path = os.path.join(self.builds[0].jobdir.src_root, "org/project2")
James E. Blairbfb8e042014-12-30 17:01:44 -08003985 repo = git.Repo(path)
3986 repo_messages = [c.message.strip() for c in repo.iter_commits(ref)]
3987 repo_messages.reverse()
Paul Belangerb30342b2016-11-14 12:30:43 -05003988 correct_messages = [
3989 'initial commit', 'add content from fixture', 'B-1']
James E. Blairbfb8e042014-12-30 17:01:44 -08003990 self.assertEqual(repo_messages, correct_messages)
3991
Paul Belanger174a8272017-03-14 13:20:10 -04003992 self.executor_server.hold_jobs_in_build = False
3993 self.executor_server.release()
Paul Belangerb30342b2016-11-14 12:30:43 -05003994 self.waitUntilSettled()
3995
James E. Blairbfb8e042014-12-30 17:01:44 -08003996 self.assertEqual(A.data['status'], 'NEW')
3997 self.assertEqual(B.data['status'], 'NEW')
3998 self.assertEqual(A.reported, 1)
3999 self.assertEqual(B.reported, 0)
4000
4001 self.assertEqual(self.history[0].changes, '2,1 1,1')
Paul Belangerb30342b2016-11-14 12:30:43 -05004002 tenant = self.sched.abide.tenants.get('tenant-one')
4003 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blair8f78d882015-02-05 08:51:37 -08004004
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004005 def test_crd_check_git_depends(self):
4006 "Test single-repo dependencies in independent pipelines"
James E. Blairb8c16472015-05-05 14:55:26 -07004007 self.gearman_server.hold_jobs_in_build = True
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004008 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4009 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
4010
4011 # Add two git-dependent changes and make sure they both report
4012 # success.
4013 B.setDependsOn(A, 1)
4014 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4015 self.waitUntilSettled()
4016 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4017 self.waitUntilSettled()
4018
James E. Blairb8c16472015-05-05 14:55:26 -07004019 self.orderedRelease()
4020 self.gearman_server.hold_jobs_in_build = False
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004021 self.waitUntilSettled()
4022
4023 self.assertEqual(A.data['status'], 'NEW')
4024 self.assertEqual(B.data['status'], 'NEW')
4025 self.assertEqual(A.reported, 1)
4026 self.assertEqual(B.reported, 1)
4027
4028 self.assertEqual(self.history[0].changes, '1,1')
4029 self.assertEqual(self.history[-1].changes, '1,1 2,1')
Paul Belanger08136962016-11-03 17:57:38 -04004030 tenant = self.sched.abide.tenants.get('tenant-one')
4031 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004032
4033 self.assertIn('Build succeeded', A.messages[0])
4034 self.assertIn('Build succeeded', B.messages[0])
4035
4036 def test_crd_check_duplicate(self):
4037 "Test duplicate check in independent pipelines"
Paul Belanger174a8272017-03-14 13:20:10 -04004038 self.executor_server.hold_jobs_in_build = True
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004039 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4040 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
Paul Belanger08136962016-11-03 17:57:38 -04004041 tenant = self.sched.abide.tenants.get('tenant-one')
4042 check_pipeline = tenant.layout.pipelines['check']
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004043
4044 # Add two git-dependent changes...
4045 B.setDependsOn(A, 1)
4046 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4047 self.waitUntilSettled()
4048 self.assertEqual(len(check_pipeline.getAllItems()), 2)
4049
4050 # ...make sure the live one is not duplicated...
4051 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4052 self.waitUntilSettled()
4053 self.assertEqual(len(check_pipeline.getAllItems()), 2)
4054
4055 # ...but the non-live one is able to be.
4056 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4057 self.waitUntilSettled()
4058 self.assertEqual(len(check_pipeline.getAllItems()), 3)
4059
Clark Boylandd849822015-03-02 12:38:14 -08004060 # Release jobs in order to avoid races with change A jobs
4061 # finishing before change B jobs.
James E. Blaird7650852015-05-07 15:47:37 -07004062 self.orderedRelease()
Paul Belanger174a8272017-03-14 13:20:10 -04004063 self.executor_server.hold_jobs_in_build = False
4064 self.executor_server.release()
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004065 self.waitUntilSettled()
4066
4067 self.assertEqual(A.data['status'], 'NEW')
4068 self.assertEqual(B.data['status'], 'NEW')
4069 self.assertEqual(A.reported, 1)
4070 self.assertEqual(B.reported, 1)
4071
4072 self.assertEqual(self.history[0].changes, '1,1 2,1')
4073 self.assertEqual(self.history[1].changes, '1,1')
Paul Belanger08136962016-11-03 17:57:38 -04004074 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blairdbfe1cd2015-02-07 11:41:19 -08004075
4076 self.assertIn('Build succeeded', A.messages[0])
4077 self.assertIn('Build succeeded', B.messages[0])
4078
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004079 def _test_crd_check_reconfiguration(self, project1, project2):
James E. Blair8f78d882015-02-05 08:51:37 -08004080 "Test cross-repo dependencies re-enqueued in independent pipelines"
4081
4082 self.gearman_server.hold_jobs_in_queue = True
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004083 A = self.fake_gerrit.addFakeChange(project1, 'master', 'A')
4084 B = self.fake_gerrit.addFakeChange(project2, 'master', 'B')
James E. Blair8f78d882015-02-05 08:51:37 -08004085
4086 # A Depends-On: B
4087 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4088 A.subject, B.data['id'])
4089
4090 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4091 self.waitUntilSettled()
4092
4093 self.sched.reconfigure(self.config)
4094
4095 # Make sure the items still share a change queue, and the
4096 # first one is not live.
Paul Belangerce4485f2016-11-11 17:01:56 -05004097 tenant = self.sched.abide.tenants.get('tenant-one')
4098 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 1)
4099 queue = tenant.layout.pipelines['check'].queues[0]
James E. Blair8f78d882015-02-05 08:51:37 -08004100 first_item = queue.queue[0]
4101 for item in queue.queue:
4102 self.assertEqual(item.queue, first_item.queue)
4103 self.assertFalse(first_item.live)
4104 self.assertTrue(queue.queue[1].live)
4105
4106 self.gearman_server.hold_jobs_in_queue = False
4107 self.gearman_server.release()
4108 self.waitUntilSettled()
4109
4110 self.assertEqual(A.data['status'], 'NEW')
4111 self.assertEqual(B.data['status'], 'NEW')
4112 self.assertEqual(A.reported, 1)
4113 self.assertEqual(B.reported, 0)
4114
4115 self.assertEqual(self.history[0].changes, '2,1 1,1')
Paul Belangerce4485f2016-11-11 17:01:56 -05004116 self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0)
James E. Blair17dd6772015-02-09 14:45:18 -08004117
Evgeny Antyshev0deaaad2015-08-03 20:22:56 +00004118 def test_crd_check_reconfiguration(self):
4119 self._test_crd_check_reconfiguration('org/project1', 'org/project2')
4120
4121 def test_crd_undefined_project(self):
4122 """Test that undefined projects in dependencies are handled for
4123 independent pipelines"""
4124 # It's a hack for fake gerrit,
4125 # as it implies repo creation upon the creation of any change
4126 self.init_repo("org/unknown")
4127 self._test_crd_check_reconfiguration('org/project1', 'org/unknown')
4128
James E. Blairec056492016-07-22 09:45:56 -07004129 @skip("Disabled for early v3 development")
James E. Blair17dd6772015-02-09 14:45:18 -08004130 def test_crd_check_ignore_dependencies(self):
4131 "Test cross-repo dependencies can be ignored"
James E. Blairf84026c2015-12-08 16:11:46 -08004132 self.updateConfigLayout(
4133 'tests/fixtures/layout-ignore-dependencies.yaml')
James E. Blair17dd6772015-02-09 14:45:18 -08004134 self.sched.reconfigure(self.config)
4135 self.registerJobs()
4136
4137 self.gearman_server.hold_jobs_in_queue = True
4138 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4139 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4140 C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C')
4141
4142 # A Depends-On: B
4143 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4144 A.subject, B.data['id'])
4145 # C git-depends on B
4146 C.setDependsOn(B, 1)
4147 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4148 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4149 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4150 self.waitUntilSettled()
4151
4152 # Make sure none of the items share a change queue, and all
4153 # are live.
4154 check_pipeline = self.sched.layout.pipelines['check']
4155 self.assertEqual(len(check_pipeline.queues), 3)
4156 self.assertEqual(len(check_pipeline.getAllItems()), 3)
4157 for item in check_pipeline.getAllItems():
4158 self.assertTrue(item.live)
4159
4160 self.gearman_server.hold_jobs_in_queue = False
4161 self.gearman_server.release()
4162 self.waitUntilSettled()
4163
4164 self.assertEqual(A.data['status'], 'NEW')
4165 self.assertEqual(B.data['status'], 'NEW')
4166 self.assertEqual(C.data['status'], 'NEW')
4167 self.assertEqual(A.reported, 1)
4168 self.assertEqual(B.reported, 1)
4169 self.assertEqual(C.reported, 1)
4170
4171 # Each job should have tested exactly one change
4172 for job in self.history:
4173 self.assertEqual(len(job.changes.split()), 1)
James E. Blair96698e22015-04-02 07:48:21 -07004174
James E. Blairec056492016-07-22 09:45:56 -07004175 @skip("Disabled for early v3 development")
James E. Blair96698e22015-04-02 07:48:21 -07004176 def test_crd_check_transitive(self):
4177 "Test transitive cross-repo dependencies"
4178 # Specifically, if A -> B -> C, and C gets a new patchset and
4179 # A gets a new patchset, ensure the test of A,2 includes B,1
4180 # and C,2 (not C,1 which would indicate stale data in the
4181 # cache for B).
4182 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4183 B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
4184 C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C')
4185
4186 # A Depends-On: B
4187 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4188 A.subject, B.data['id'])
4189
4190 # B Depends-On: C
4191 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4192 B.subject, C.data['id'])
4193
4194 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4195 self.waitUntilSettled()
4196 self.assertEqual(self.history[-1].changes, '3,1 2,1 1,1')
4197
4198 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4199 self.waitUntilSettled()
4200 self.assertEqual(self.history[-1].changes, '3,1 2,1')
4201
4202 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4203 self.waitUntilSettled()
4204 self.assertEqual(self.history[-1].changes, '3,1')
4205
4206 C.addPatchset()
4207 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(2))
4208 self.waitUntilSettled()
4209 self.assertEqual(self.history[-1].changes, '3,2')
4210
4211 A.addPatchset()
4212 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2))
4213 self.waitUntilSettled()
4214 self.assertEqual(self.history[-1].changes, '3,2 2,1 1,2')
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004215
James E. Blaira8b90b32016-08-24 15:18:50 -07004216 def test_crd_check_unknown(self):
4217 "Test unknown projects in independent pipeline"
4218 self.init_repo("org/unknown")
4219 A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
4220 B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D')
4221 # A Depends-On: B
4222 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4223 A.subject, B.data['id'])
4224
4225 # Make sure zuul has seen an event on B.
4226 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4227 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4228 self.waitUntilSettled()
4229
4230 self.assertEqual(A.data['status'], 'NEW')
4231 self.assertEqual(A.reported, 1)
4232 self.assertEqual(B.data['status'], 'NEW')
4233 self.assertEqual(B.reported, 0)
4234
James E. Blair92464a22016-04-05 10:21:26 -07004235 def test_crd_cycle_join(self):
4236 "Test an updated change creates a cycle"
4237 A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A')
4238
4239 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4240 self.waitUntilSettled()
4241
4242 # Create B->A
4243 B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B')
4244 B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4245 B.subject, A.data['id'])
4246 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4247 self.waitUntilSettled()
4248
4249 # Update A to add A->B (a cycle).
4250 A.addPatchset()
4251 A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
4252 A.subject, B.data['id'])
4253 # Normally we would submit the patchset-created event for
4254 # processing here, however, we have no way of noting whether
4255 # the dependency cycle detection correctly raised an
4256 # exception, so instead, we reach into the source driver and
4257 # call the method that would ultimately be called by the event
4258 # processing.
4259
Paul Belanger0e155e22016-11-14 14:12:23 -05004260 tenant = self.sched.abide.tenants.get('tenant-one')
4261 source = tenant.layout.pipelines['gate'].source
4262
4263 # TODO(pabelanger): As we add more source / trigger APIs we should make
4264 # it easier for users to create events for testing.
4265 event = zuul.model.TriggerEvent()
4266 event.trigger_name = 'gerrit'
4267 event.change_number = '1'
4268 event.patch_number = '2'
James E. Blair92464a22016-04-05 10:21:26 -07004269 with testtools.ExpectedException(
4270 Exception, "Dependency cycle detected"):
Paul Belanger0e155e22016-11-14 14:12:23 -05004271 source.getChange(event, True)
James E. Blair92464a22016-04-05 10:21:26 -07004272 self.log.debug("Got expected dependency cycle exception")
4273
4274 # Now if we update B to remove the depends-on, everything
4275 # should be okay. B; A->B
4276
4277 B.addPatchset()
4278 B.data['commitMessage'] = '%s\n' % (B.subject,)
Paul Belanger0e155e22016-11-14 14:12:23 -05004279
4280 source.getChange(event, True)
4281 event.change_number = '2'
4282 source.getChange(event, True)
James E. Blair92464a22016-04-05 10:21:26 -07004283
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004284 def test_disable_at(self):
4285 "Test a pipeline will only report to the disabled trigger when failing"
4286
Paul Belanger7dc76e82016-11-11 16:51:08 -05004287 self.updateConfigLayout('layout-disabled-at')
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004288 self.sched.reconfigure(self.config)
4289
Paul Belanger7dc76e82016-11-11 16:51:08 -05004290 tenant = self.sched.abide.tenants.get('openstack')
4291 self.assertEqual(3, tenant.layout.pipelines['check'].disable_at)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004292 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004293 0, tenant.layout.pipelines['check']._consecutive_failures)
4294 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004295
4296 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4297 B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B')
4298 C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C')
4299 D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D')
4300 E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E')
4301 F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F')
4302 G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G')
4303 H = self.fake_gerrit.addFakeChange('org/project', 'master', 'H')
4304 I = self.fake_gerrit.addFakeChange('org/project', 'master', 'I')
4305 J = self.fake_gerrit.addFakeChange('org/project', 'master', 'J')
4306 K = self.fake_gerrit.addFakeChange('org/project', 'master', 'K')
4307
Paul Belanger174a8272017-03-14 13:20:10 -04004308 self.executor_server.failJob('project-test1', A)
4309 self.executor_server.failJob('project-test1', B)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004310 # Let C pass, resetting the counter
Paul Belanger174a8272017-03-14 13:20:10 -04004311 self.executor_server.failJob('project-test1', D)
4312 self.executor_server.failJob('project-test1', E)
4313 self.executor_server.failJob('project-test1', F)
4314 self.executor_server.failJob('project-test1', G)
4315 self.executor_server.failJob('project-test1', H)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004316 # I also passes but should only report to the disabled reporters
Paul Belanger174a8272017-03-14 13:20:10 -04004317 self.executor_server.failJob('project-test1', J)
4318 self.executor_server.failJob('project-test1', K)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004319
4320 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4321 self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
4322 self.waitUntilSettled()
4323
4324 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004325 2, tenant.layout.pipelines['check']._consecutive_failures)
4326 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004327
4328 self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1))
4329 self.waitUntilSettled()
4330
4331 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004332 0, tenant.layout.pipelines['check']._consecutive_failures)
4333 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004334
4335 self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1))
4336 self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1))
4337 self.fake_gerrit.addEvent(F.getPatchsetCreatedEvent(1))
4338 self.waitUntilSettled()
4339
4340 # We should be disabled now
4341 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004342 3, tenant.layout.pipelines['check']._consecutive_failures)
4343 self.assertTrue(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004344
4345 # We need to wait between each of these patches to make sure the
4346 # smtp messages come back in an expected order
4347 self.fake_gerrit.addEvent(G.getPatchsetCreatedEvent(1))
4348 self.waitUntilSettled()
4349 self.fake_gerrit.addEvent(H.getPatchsetCreatedEvent(1))
4350 self.waitUntilSettled()
4351 self.fake_gerrit.addEvent(I.getPatchsetCreatedEvent(1))
4352 self.waitUntilSettled()
4353
4354 # The first 6 (ABCDEF) jobs should have reported back to gerrt thus
4355 # leaving a message on each change
4356 self.assertEqual(1, len(A.messages))
4357 self.assertIn('Build failed.', A.messages[0])
4358 self.assertEqual(1, len(B.messages))
4359 self.assertIn('Build failed.', B.messages[0])
4360 self.assertEqual(1, len(C.messages))
4361 self.assertIn('Build succeeded.', C.messages[0])
4362 self.assertEqual(1, len(D.messages))
4363 self.assertIn('Build failed.', D.messages[0])
4364 self.assertEqual(1, len(E.messages))
4365 self.assertIn('Build failed.', E.messages[0])
4366 self.assertEqual(1, len(F.messages))
4367 self.assertIn('Build failed.', F.messages[0])
4368
4369 # The last 3 (GHI) would have only reported via smtp.
4370 self.assertEqual(3, len(self.smtp_messages))
4371 self.assertEqual(0, len(G.messages))
4372 self.assertIn('Build failed.', self.smtp_messages[0]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004373 self.assertIn(
4374 'project-test1 https://server/job', self.smtp_messages[0]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004375 self.assertEqual(0, len(H.messages))
4376 self.assertIn('Build failed.', self.smtp_messages[1]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004377 self.assertIn(
4378 'project-test1 https://server/job', self.smtp_messages[1]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004379 self.assertEqual(0, len(I.messages))
4380 self.assertIn('Build succeeded.', self.smtp_messages[2]['body'])
Paul Belanger7dc76e82016-11-11 16:51:08 -05004381 self.assertIn(
4382 'project-test1 https://server/job', self.smtp_messages[2]['body'])
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004383
4384 # Now reload the configuration (simulate a HUP) to check the pipeline
4385 # comes out of disabled
4386 self.sched.reconfigure(self.config)
4387
Paul Belanger7dc76e82016-11-11 16:51:08 -05004388 tenant = self.sched.abide.tenants.get('openstack')
4389
4390 self.assertEqual(3, tenant.layout.pipelines['check'].disable_at)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004391 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004392 0, tenant.layout.pipelines['check']._consecutive_failures)
4393 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004394
4395 self.fake_gerrit.addEvent(J.getPatchsetCreatedEvent(1))
4396 self.fake_gerrit.addEvent(K.getPatchsetCreatedEvent(1))
4397 self.waitUntilSettled()
4398
4399 self.assertEqual(
Paul Belanger7dc76e82016-11-11 16:51:08 -05004400 2, tenant.layout.pipelines['check']._consecutive_failures)
4401 self.assertFalse(tenant.layout.pipelines['check']._disabled)
Joshua Hesketh89e829d2015-02-10 16:29:45 +11004402
4403 # J and K went back to gerrit
4404 self.assertEqual(1, len(J.messages))
4405 self.assertIn('Build failed.', J.messages[0])
4406 self.assertEqual(1, len(K.messages))
4407 self.assertIn('Build failed.', K.messages[0])
4408 # No more messages reported via smtp
4409 self.assertEqual(3, len(self.smtp_messages))
Joshua Heskethd6dbd682015-12-22 10:06:54 +11004410
Paul Belanger71d98172016-11-08 10:56:31 -05004411 def test_rerun_on_abort(self):
Paul Belanger174a8272017-03-14 13:20:10 -04004412 "Test that if a execute server fails to run a job, it is run again"
Paul Belanger71d98172016-11-08 10:56:31 -05004413
Paul Belanger174a8272017-03-14 13:20:10 -04004414 self.executor_server.hold_jobs_in_build = True
Paul Belanger71d98172016-11-08 10:56:31 -05004415 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4416 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4417 self.waitUntilSettled()
4418
Paul Belanger174a8272017-03-14 13:20:10 -04004419 self.executor_server.release('.*-merge')
Paul Belanger71d98172016-11-08 10:56:31 -05004420 self.waitUntilSettled()
4421
4422 self.assertEqual(len(self.builds), 2)
4423 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04004424 self.executor_server.release('.*-test*')
Paul Belanger71d98172016-11-08 10:56:31 -05004425 self.waitUntilSettled()
4426
Clint Byrum5bb5feb2016-12-08 12:39:05 -08004427 for x in range(3):
Clint Byrumdf0a55b2016-12-05 06:39:11 -08004428 self.assertEqual(len(self.builds), 1,
4429 'len of builds at x=%d is wrong' % x)
Paul Belanger71d98172016-11-08 10:56:31 -05004430 self.builds[0].requeue = True
Paul Belanger174a8272017-03-14 13:20:10 -04004431 self.executor_server.release('.*-test1')
Paul Belanger71d98172016-11-08 10:56:31 -05004432 self.waitUntilSettled()
4433
Paul Belanger174a8272017-03-14 13:20:10 -04004434 self.executor_server.hold_jobs_in_build = False
4435 self.executor_server.release()
Paul Belanger71d98172016-11-08 10:56:31 -05004436 self.waitUntilSettled()
Clint Byrum5bb5feb2016-12-08 12:39:05 -08004437 self.assertEqual(len(self.history), 6)
Paul Belanger71d98172016-11-08 10:56:31 -05004438 self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 2)
4439 self.assertEqual(A.reported, 1)
4440 self.assertIn('RETRY_LIMIT', A.messages[0])
Joshua Hesketh3f7def32016-11-21 17:36:44 +11004441
James E. Blair15be0e12017-01-03 13:45:20 -08004442 def test_zookeeper_disconnect(self):
Paul Belanger174a8272017-03-14 13:20:10 -04004443 "Test that jobs are executed after a zookeeper disconnect"
James E. Blair15be0e12017-01-03 13:45:20 -08004444
4445 self.fake_nodepool.paused = True
4446 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4447 A.addApproval('code-review', 2)
4448 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4449 self.waitUntilSettled()
4450
4451 self.zk.client.stop()
4452 self.zk.client.start()
4453 self.fake_nodepool.paused = False
4454 self.waitUntilSettled()
4455
4456 self.assertEqual(A.data['status'], 'MERGED')
4457 self.assertEqual(A.reported, 2)
4458
James E. Blair6ab79e02017-01-06 10:10:17 -08004459 def test_nodepool_failure(self):
4460 "Test that jobs are reported after a nodepool failure"
4461
4462 self.fake_nodepool.paused = True
4463 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4464 A.addApproval('code-review', 2)
4465 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4466 self.waitUntilSettled()
4467
4468 req = self.fake_nodepool.getNodeRequests()[0]
4469 self.fake_nodepool.addFailRequest(req)
4470
4471 self.fake_nodepool.paused = False
4472 self.waitUntilSettled()
4473
4474 self.assertEqual(A.data['status'], 'NEW')
4475 self.assertEqual(A.reported, 2)
4476 self.assertIn('project-merge : NODE_FAILURE', A.messages[1])
4477 self.assertIn('project-test1 : SKIPPED', A.messages[1])
4478 self.assertIn('project-test2 : SKIPPED', A.messages[1])
4479
Arieb6f068c2016-10-09 13:11:06 +03004480
4481class TestDuplicatePipeline(ZuulTestCase):
4482 tenant_config_file = 'config/duplicate-pipeline/main.yaml'
4483
4484 def test_duplicate_pipelines(self):
4485 "Test that a change matching multiple pipelines works"
4486
4487 A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
4488 self.fake_gerrit.addEvent(A.getChangeRestoredEvent())
4489 self.waitUntilSettled()
4490
4491 self.assertHistory([
4492 dict(name='project-test1', result='SUCCESS', changes='1,1',
4493 pipeline='dup1'),
4494 dict(name='project-test1', result='SUCCESS', changes='1,1',
4495 pipeline='dup2'),
Paul Belanger73a7d8e2016-11-09 11:12:42 -05004496 ], ordered=False)
Arieb6f068c2016-10-09 13:11:06 +03004497
4498 self.assertEqual(len(A.messages), 2)
4499
Paul Belangera46a3742016-11-09 14:23:03 -05004500 if 'dup1' in A.messages[0]:
4501 self.assertIn('dup1', A.messages[0])
4502 self.assertNotIn('dup2', A.messages[0])
4503 self.assertIn('project-test1', A.messages[0])
4504 self.assertIn('dup2', A.messages[1])
4505 self.assertNotIn('dup1', A.messages[1])
4506 self.assertIn('project-test1', A.messages[1])
4507 else:
4508 self.assertIn('dup1', A.messages[1])
4509 self.assertNotIn('dup2', A.messages[1])
4510 self.assertIn('project-test1', A.messages[1])
4511 self.assertIn('dup2', A.messages[0])
4512 self.assertNotIn('dup1', A.messages[0])
4513 self.assertIn('project-test1', A.messages[0])
Paul Belangerfac69ba2016-11-03 09:03:13 -04004514
4515
4516class TestSchedulerOneJobProject(ZuulTestCase):
4517 tenant_config_file = 'config/one-job-project/main.yaml'
4518
4519 def test_one_job_project(self):
4520 "Test that queueing works with one job"
4521 A = self.fake_gerrit.addFakeChange('org/one-job-project',
4522 'master', 'A')
4523 B = self.fake_gerrit.addFakeChange('org/one-job-project',
4524 'master', 'B')
4525 A.addApproval('code-review', 2)
4526 B.addApproval('code-review', 2)
4527 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4528 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
4529 self.waitUntilSettled()
4530
4531 self.assertEqual(A.data['status'], 'MERGED')
4532 self.assertEqual(A.reported, 2)
4533 self.assertEqual(B.data['status'], 'MERGED')
4534 self.assertEqual(B.reported, 2)
Paul Belanger86085b32016-11-03 12:48:57 -04004535
4536
4537class TestSchedulerTemplatedProject(ZuulTestCase):
4538 tenant_config_file = 'config/templated-project/main.yaml'
4539
Paul Belanger174a8272017-03-14 13:20:10 -04004540 def test_job_from_templates_executed(self):
4541 "Test whether a job generated via a template can be executed"
Paul Belanger86085b32016-11-03 12:48:57 -04004542
4543 A = self.fake_gerrit.addFakeChange(
4544 'org/templated-project', 'master', 'A')
4545 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4546 self.waitUntilSettled()
4547
4548 self.assertEqual(self.getJobFromHistory('project-test1').result,
4549 'SUCCESS')
4550 self.assertEqual(self.getJobFromHistory('project-test2').result,
4551 'SUCCESS')
Paul Belanger3adf72f2016-11-03 14:57:31 -04004552
4553 def test_layered_templates(self):
Paul Belanger174a8272017-03-14 13:20:10 -04004554 "Test whether a job generated via a template can be executed"
Paul Belanger3adf72f2016-11-03 14:57:31 -04004555
4556 A = self.fake_gerrit.addFakeChange(
4557 'org/layered-project', 'master', 'A')
4558 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4559 self.waitUntilSettled()
4560
4561 self.assertEqual(self.getJobFromHistory('project-test1').result,
4562 'SUCCESS')
4563 self.assertEqual(self.getJobFromHistory('project-test2').result,
4564 'SUCCESS')
4565 self.assertEqual(self.getJobFromHistory('layered-project-test3'
4566 ).result, 'SUCCESS')
4567 self.assertEqual(self.getJobFromHistory('layered-project-test4'
4568 ).result, 'SUCCESS')
4569 self.assertEqual(self.getJobFromHistory('layered-project-foo-test5'
4570 ).result, 'SUCCESS')
4571 self.assertEqual(self.getJobFromHistory('project-test6').result,
4572 'SUCCESS')
Adam Gandelman94a60062016-11-21 16:43:14 -08004573
4574
4575class TestSchedulerSuccessURL(ZuulTestCase):
4576 tenant_config_file = 'config/success-url/main.yaml'
4577
4578 def test_success_url(self):
4579 "Ensure bad build params are ignored"
4580 self.sched.reconfigure(self.config)
4581 self.init_repo('org/docs')
4582
4583 A = self.fake_gerrit.addFakeChange('org/docs', 'master', 'A')
4584 self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
4585 self.waitUntilSettled()
4586
4587 # Both builds ran: docs-draft-test + docs-draft-test2
4588 self.assertEqual(len(self.history), 2)
4589
4590 # Grab build id
James E. Blaire7576802016-12-21 16:15:00 -08004591 for build in self.history:
4592 if build.name == 'docs-draft-test':
4593 uuid = build.uuid[:7]
4594 break
Adam Gandelman94a60062016-11-21 16:43:14 -08004595
4596 # Two msgs: 'Starting...' + results
4597 self.assertEqual(len(self.smtp_messages), 2)
4598 body = self.smtp_messages[1]['body'].splitlines()
4599 self.assertEqual('Build succeeded.', body[0])
4600
4601 self.assertIn(
4602 '- docs-draft-test http://docs-draft.example.org/1/1/1/check/'
4603 'docs-draft-test/%s/publish-docs/' % uuid,
4604 body[2])
4605
Paul Belanger174a8272017-03-14 13:20:10 -04004606 # NOTE: This default URL is currently hard-coded in executor/server.py
Adam Gandelman94a60062016-11-21 16:43:14 -08004607 self.assertIn(
4608 '- docs-draft-test2 https://server/job',
4609 body[3])
Adam Gandelman8bd57102016-12-02 12:58:42 -08004610
4611
Adam Gandelman4da00f62016-12-09 15:47:33 -08004612class TestSchedulerMerges(ZuulTestCase):
4613 tenant_config_file = 'config/merges/main.yaml'
Adam Gandelman8bd57102016-12-02 12:58:42 -08004614
4615 def _test_project_merge_mode(self, mode):
Paul Belanger174a8272017-03-14 13:20:10 -04004616 self.executor_server.keep_jobdir = False
Adam Gandelman8bd57102016-12-02 12:58:42 -08004617 project = 'org/project-%s' % mode
Paul Belanger174a8272017-03-14 13:20:10 -04004618 self.executor_server.hold_jobs_in_build = True
Adam Gandelman8bd57102016-12-02 12:58:42 -08004619 A = self.fake_gerrit.addFakeChange(project, 'master', 'A')
4620 B = self.fake_gerrit.addFakeChange(project, 'master', 'B')
4621 C = self.fake_gerrit.addFakeChange(project, 'master', 'C')
4622 A.addApproval('code-review', 2)
4623 B.addApproval('code-review', 2)
4624 C.addApproval('code-review', 2)
4625 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4626 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
4627 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
4628 self.waitUntilSettled()
4629
4630 build = self.builds[-1]
4631 ref = self.getParameter(build, 'ZUUL_REF')
4632
Monty Taylord642d852017-02-23 14:05:42 -05004633 path = os.path.join(build.jobdir.src_root, project)
Adam Gandelman8bd57102016-12-02 12:58:42 -08004634 repo = git.Repo(path)
4635 repo_messages = [c.message.strip() for c in repo.iter_commits(ref)]
4636 repo_messages.reverse()
4637
Paul Belanger174a8272017-03-14 13:20:10 -04004638 self.executor_server.hold_jobs_in_build = False
4639 self.executor_server.release()
Adam Gandelman8bd57102016-12-02 12:58:42 -08004640 self.waitUntilSettled()
4641
4642 return repo_messages
4643
4644 def _test_merge(self, mode):
4645 us_path = os.path.join(
4646 self.upstream_root, 'org/project-%s' % mode)
4647 expected_messages = [
4648 'initial commit',
4649 'add content from fixture',
4650 # the intermediate commits order is nondeterministic
4651 "Merge commit 'refs/changes/1/2/1' of %s into HEAD" % us_path,
4652 "Merge commit 'refs/changes/1/3/1' of %s into HEAD" % us_path,
4653 ]
4654 result = self._test_project_merge_mode(mode)
4655 self.assertEqual(result[:2], expected_messages[:2])
4656 self.assertEqual(result[-2:], expected_messages[-2:])
4657
4658 def test_project_merge_mode_merge(self):
4659 self._test_merge('merge')
4660
4661 def test_project_merge_mode_merge_resolve(self):
4662 self._test_merge('merge-resolve')
4663
4664 def test_project_merge_mode_cherrypick(self):
4665 expected_messages = [
4666 'initial commit',
4667 'add content from fixture',
4668 'A-1',
4669 'B-1',
4670 'C-1']
4671 result = self._test_project_merge_mode('cherry-pick')
4672 self.assertEqual(result, expected_messages)
Adam Gandelman4da00f62016-12-09 15:47:33 -08004673
4674 def test_merge_branch(self):
4675 "Test that the right commits are on alternate branches"
4676 self.create_branch('org/project-merge-branches', 'mp')
4677
Paul Belanger174a8272017-03-14 13:20:10 -04004678 self.executor_server.hold_jobs_in_build = True
Adam Gandelman4da00f62016-12-09 15:47:33 -08004679 A = self.fake_gerrit.addFakeChange(
4680 'org/project-merge-branches', 'mp', 'A')
4681 B = self.fake_gerrit.addFakeChange(
4682 'org/project-merge-branches', 'mp', 'B')
4683 C = self.fake_gerrit.addFakeChange(
4684 'org/project-merge-branches', 'mp', 'C')
4685 A.addApproval('code-review', 2)
4686 B.addApproval('code-review', 2)
4687 C.addApproval('code-review', 2)
4688 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4689 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
4690 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
4691 self.waitUntilSettled()
4692
Paul Belanger174a8272017-03-14 13:20:10 -04004693 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004694 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004695 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004696 self.waitUntilSettled()
Paul Belanger174a8272017-03-14 13:20:10 -04004697 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004698 self.waitUntilSettled()
4699
4700 build = self.builds[-1]
4701 self.assertEqual(self.getParameter(build, 'ZUUL_BRANCH'), 'mp')
4702 ref = self.getParameter(build, 'ZUUL_REF')
4703 path = os.path.join(
Monty Taylord642d852017-02-23 14:05:42 -05004704 build.jobdir.src_root, 'org/project-merge-branches')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004705 repo = git.Repo(path)
4706
4707 repo_messages = [c.message.strip() for c in repo.iter_commits(ref)]
4708 repo_messages.reverse()
4709 correct_messages = [
4710 'initial commit',
4711 'add content from fixture',
4712 'mp commit',
4713 'A-1', 'B-1', 'C-1']
4714 self.assertEqual(repo_messages, correct_messages)
4715
Paul Belanger174a8272017-03-14 13:20:10 -04004716 self.executor_server.hold_jobs_in_build = False
4717 self.executor_server.release()
Adam Gandelman4da00f62016-12-09 15:47:33 -08004718 self.waitUntilSettled()
4719
4720 def test_merge_multi_branch(self):
4721 "Test that dependent changes on multiple branches are merged"
4722 self.create_branch('org/project-merge-branches', 'mp')
4723
Paul Belanger174a8272017-03-14 13:20:10 -04004724 self.executor_server.hold_jobs_in_build = True
Adam Gandelman4da00f62016-12-09 15:47:33 -08004725 A = self.fake_gerrit.addFakeChange(
4726 'org/project-merge-branches', 'master', 'A')
4727 B = self.fake_gerrit.addFakeChange(
4728 'org/project-merge-branches', 'mp', 'B')
4729 C = self.fake_gerrit.addFakeChange(
4730 'org/project-merge-branches', 'master', 'C')
4731 A.addApproval('code-review', 2)
4732 B.addApproval('code-review', 2)
4733 C.addApproval('code-review', 2)
4734 self.fake_gerrit.addEvent(A.addApproval('approved', 1))
4735 self.fake_gerrit.addEvent(B.addApproval('approved', 1))
4736 self.fake_gerrit.addEvent(C.addApproval('approved', 1))
4737 self.waitUntilSettled()
4738
4739 job_A = None
4740 for job in self.builds:
4741 if 'project-merge' in job.name:
4742 job_A = job
4743 ref_A = self.getParameter(job_A, 'ZUUL_REF')
4744 commit_A = self.getParameter(job_A, 'ZUUL_COMMIT')
4745 self.log.debug("Got Zuul ref for change A: %s" % ref_A)
4746 self.log.debug("Got Zuul commit for change A: %s" % commit_A)
4747
4748 path = os.path.join(
Monty Taylord642d852017-02-23 14:05:42 -05004749 job_A.jobdir.src_root, "org/project-merge-branches")
Adam Gandelman4da00f62016-12-09 15:47:33 -08004750 repo = git.Repo(path)
4751 repo_messages = [c.message.strip()
4752 for c in repo.iter_commits(ref_A)]
4753 repo_messages.reverse()
4754 correct_messages = [
4755 'initial commit', 'add content from fixture', 'A-1']
4756 self.assertEqual(repo_messages, correct_messages)
4757
Paul Belanger174a8272017-03-14 13:20:10 -04004758 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004759 self.waitUntilSettled()
4760
4761 job_B = None
4762 for job in self.builds:
4763 if 'project-merge' in job.name:
4764 job_B = job
4765 ref_B = self.getParameter(job_B, 'ZUUL_REF')
4766 commit_B = self.getParameter(job_B, 'ZUUL_COMMIT')
4767 self.log.debug("Got Zuul ref for change B: %s" % ref_B)
4768 self.log.debug("Got Zuul commit for change B: %s" % commit_B)
4769
4770 path = os.path.join(
Monty Taylord642d852017-02-23 14:05:42 -05004771 job_B.jobdir.src_root, "org/project-merge-branches")
Adam Gandelman4da00f62016-12-09 15:47:33 -08004772 repo = git.Repo(path)
4773 repo_messages = [c.message.strip()
4774 for c in repo.iter_commits(ref_B)]
4775 repo_messages.reverse()
4776 correct_messages = [
4777 'initial commit', 'add content from fixture', 'mp commit', 'B-1']
4778 self.assertEqual(repo_messages, correct_messages)
4779
Paul Belanger174a8272017-03-14 13:20:10 -04004780 self.executor_server.release('.*-merge')
Adam Gandelman4da00f62016-12-09 15:47:33 -08004781 self.waitUntilSettled()
4782
4783 job_C = None
4784 for job in self.builds:
4785 if 'project-merge' in job.name:
4786 job_C = job
4787 ref_C = self.getParameter(job_C, 'ZUUL_REF')
4788 commit_C = self.getParameter(job_C, 'ZUUL_COMMIT')
4789 self.log.debug("Got Zuul ref for change C: %s" % ref_C)
4790 self.log.debug("Got Zuul commit for change C: %s" % commit_C)
4791 path = os.path.join(
Monty Taylord642d852017-02-23 14:05:42 -05004792 job_C.jobdir.src_root, "org/project-merge-branches")
Adam Gandelman4da00f62016-12-09 15:47:33 -08004793 repo = git.Repo(path)
4794 repo_messages = [c.message.strip()
4795 for c in repo.iter_commits(ref_C)]
4796
4797 repo_messages.reverse()
4798 correct_messages = [
4799 'initial commit', 'add content from fixture',
4800 'A-1', 'C-1']
4801 # Ensure the right commits are in the history for this ref
4802 self.assertEqual(repo_messages, correct_messages)
4803
Paul Belanger174a8272017-03-14 13:20:10 -04004804 self.executor_server.hold_jobs_in_build = False
4805 self.executor_server.release()
Adam Gandelman4da00f62016-12-09 15:47:33 -08004806 self.waitUntilSettled()