James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 1 | #!/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. Blair | a002b03 | 2017-04-18 10:35:48 -0700 | [diff] [blame] | 17 | import gc |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 18 | import json |
Tobias Henkel | 9a0e194 | 2017-03-20 16:16:02 +0100 | [diff] [blame] | 19 | import textwrap |
| 20 | |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 21 | import os |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 22 | import re |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 23 | import shutil |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 24 | import time |
Clint Byrum | 03454a5 | 2017-05-26 17:14:02 -0700 | [diff] [blame] | 25 | from unittest import skip |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 26 | |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 27 | import git |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 28 | import testtools |
Monty Taylor | b934c1a | 2017-06-16 19:31:47 -0500 | [diff] [blame] | 29 | import urllib |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 30 | |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 31 | import zuul.change_matcher |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 32 | from zuul.driver.gerrit import gerritreporter |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 33 | import zuul.scheduler |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 34 | import zuul.rpcclient |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 35 | import zuul.model |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 36 | |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 37 | from tests.base import ( |
Paul Belanger | 0a21f0a | 2017-06-13 13:14:42 -0400 | [diff] [blame] | 38 | SSLZuulTestCase, |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 39 | ZuulTestCase, |
| 40 | repack_repo, |
James E. Blair | 06cc392 | 2017-04-19 10:08:10 -0700 | [diff] [blame] | 41 | simple_layout, |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 42 | ) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 43 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 44 | |
Paul Belanger | 0a21f0a | 2017-06-13 13:14:42 -0400 | [diff] [blame] | 45 | class TestSchedulerSSL(SSLZuulTestCase): |
| 46 | tenant_config_file = 'config/single-tenant/main.yaml' |
| 47 | |
| 48 | def test_jobs_executed(self): |
| 49 | "Test that jobs are executed and a change is merged" |
| 50 | |
| 51 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 52 | A.addApproval('code-review', 2) |
| 53 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 54 | self.waitUntilSettled() |
| 55 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 56 | 'SUCCESS') |
| 57 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 58 | 'SUCCESS') |
| 59 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 60 | 'SUCCESS') |
| 61 | self.assertEqual(A.data['status'], 'MERGED') |
| 62 | self.assertEqual(A.reported, 2) |
| 63 | self.assertEqual(self.getJobFromHistory('project-test1').node, |
| 64 | 'label1') |
| 65 | self.assertIsNone(self.getJobFromHistory('project-test2').node) |
| 66 | |
| 67 | |
Clark Boylan | b640e05 | 2014-04-03 16:41:46 -0700 | [diff] [blame] | 68 | class TestScheduler(ZuulTestCase): |
James E. Blair | 552b54f | 2016-07-22 13:55:32 -0700 | [diff] [blame] | 69 | tenant_config_file = 'config/single-tenant/main.yaml' |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 70 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 71 | def test_jobs_executed(self): |
| 72 | "Test that jobs are executed and a change is merged" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 73 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 74 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 75 | A.addApproval('code-review', 2) |
| 76 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 77 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 78 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 79 | 'SUCCESS') |
| 80 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 81 | 'SUCCESS') |
| 82 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 83 | 'SUCCESS') |
| 84 | self.assertEqual(A.data['status'], 'MERGED') |
| 85 | self.assertEqual(A.reported, 2) |
James E. Blair | 34776ee | 2016-08-25 13:53:54 -0700 | [diff] [blame] | 86 | self.assertEqual(self.getJobFromHistory('project-test1').node, |
James E. Blair | 16d96a0 | 2017-06-08 11:32:56 -0700 | [diff] [blame] | 87 | 'label1') |
Adam Gandelman | eace469 | 2017-02-07 15:18:36 -0800 | [diff] [blame] | 88 | self.assertIsNone(self.getJobFromHistory('project-test2').node) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 89 | |
James E. Blair | 552b54f | 2016-07-22 13:55:32 -0700 | [diff] [blame] | 90 | # TODOv3(jeblair): we may want to report stats by tenant (also?). |
Monty Taylor | f138504 | 2017-05-27 12:25:05 -0500 | [diff] [blame] | 91 | # Per-driver |
| 92 | self.assertReportedStat('zuul.event.gerrit.comment-added', value='1|c') |
| 93 | # Per-driver per-connection |
| 94 | self.assertReportedStat('zuul.event.gerrit.gerrit.comment-added', |
| 95 | value='1|c') |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 96 | self.assertReportedStat('zuul.pipeline.gate.current_changes', |
| 97 | value='1|g') |
| 98 | self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS', |
| 99 | kind='ms') |
| 100 | self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS', |
| 101 | value='1|c') |
| 102 | self.assertReportedStat('zuul.pipeline.gate.resident_time', kind='ms') |
| 103 | self.assertReportedStat('zuul.pipeline.gate.total_changes', |
| 104 | value='1|c') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 105 | self.assertReportedStat( |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 106 | 'zuul.pipeline.gate.org.project.resident_time', kind='ms') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 107 | self.assertReportedStat( |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 108 | 'zuul.pipeline.gate.org.project.total_changes', value='1|c') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 109 | |
James E. Blair | 5821bd9 | 2015-09-16 08:48:15 -0700 | [diff] [blame] | 110 | for build in self.builds: |
| 111 | self.assertEqual(build.parameters['ZUUL_VOTING'], '1') |
| 112 | |
James E. Blair | 3cb1070 | 2013-08-24 08:56:03 -0700 | [diff] [blame] | 113 | def test_initial_pipeline_gauges(self): |
| 114 | "Test that each pipeline reported its length on start" |
James E. Blair | 7da51b7 | 2016-07-25 15:29:43 -0700 | [diff] [blame] | 115 | self.assertReportedStat('zuul.pipeline.gate.current_changes', |
| 116 | value='0|g') |
| 117 | self.assertReportedStat('zuul.pipeline.check.current_changes', |
| 118 | value='0|g') |
James E. Blair | 3cb1070 | 2013-08-24 08:56:03 -0700 | [diff] [blame] | 119 | |
James E. Blair | 34776ee | 2016-08-25 13:53:54 -0700 | [diff] [blame] | 120 | def test_job_branch(self): |
| 121 | "Test the correct variant of a job runs on a branch" |
| 122 | self.create_branch('org/project', 'stable') |
| 123 | A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A') |
| 124 | A.addApproval('code-review', 2) |
| 125 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 126 | self.waitUntilSettled() |
| 127 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 128 | 'SUCCESS') |
| 129 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 130 | 'SUCCESS') |
| 131 | self.assertEqual(A.data['status'], 'MERGED') |
| 132 | self.assertEqual(A.reported, 2, |
| 133 | "A should report start and success") |
| 134 | self.assertIn('gate', A.messages[1], |
| 135 | "A should transit gate") |
| 136 | self.assertEqual(self.getJobFromHistory('project-test1').node, |
James E. Blair | 16d96a0 | 2017-06-08 11:32:56 -0700 | [diff] [blame] | 137 | 'label2') |
James E. Blair | 34776ee | 2016-08-25 13:53:54 -0700 | [diff] [blame] | 138 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 139 | def test_parallel_changes(self): |
| 140 | "Test that changes are tested in parallel and merged in series" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 141 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 142 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 143 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 144 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 145 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 146 | A.addApproval('code-review', 2) |
| 147 | B.addApproval('code-review', 2) |
| 148 | C.addApproval('code-review', 2) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 149 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 150 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 151 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 152 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 153 | |
| 154 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 155 | self.assertEqual(len(self.builds), 1) |
| 156 | self.assertEqual(self.builds[0].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 157 | self.assertTrue(self.builds[0].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 158 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 159 | self.executor_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 160 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 161 | self.assertEqual(len(self.builds), 3) |
| 162 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 163 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 164 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 165 | self.assertTrue(self.builds[1].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 166 | self.assertEqual(self.builds[2].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 167 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 168 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 169 | self.executor_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 170 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 171 | self.assertEqual(len(self.builds), 5) |
| 172 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 173 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 174 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 175 | self.assertTrue(self.builds[1].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 176 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 177 | self.assertEqual(self.builds[2].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 178 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 179 | self.assertEqual(self.builds[3].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 180 | self.assertTrue(self.builds[3].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 181 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 182 | self.assertEqual(self.builds[4].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 183 | self.assertTrue(self.builds[4].hasChanges(A, B, C)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 184 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 185 | self.executor_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 186 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 187 | self.assertEqual(len(self.builds), 6) |
| 188 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 189 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 190 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 191 | self.assertTrue(self.builds[1].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 192 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 193 | self.assertEqual(self.builds[2].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 194 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 195 | self.assertEqual(self.builds[3].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 196 | self.assertTrue(self.builds[3].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 197 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 198 | self.assertEqual(self.builds[4].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 199 | self.assertTrue(self.builds[4].hasChanges(A, B, C)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 200 | self.assertEqual(self.builds[5].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 201 | self.assertTrue(self.builds[5].hasChanges(A, B, C)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 202 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 203 | self.executor_server.hold_jobs_in_build = False |
| 204 | self.executor_server.release() |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 205 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 206 | self.assertEqual(len(self.builds), 0) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 207 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 208 | self.assertEqual(len(self.history), 9) |
| 209 | self.assertEqual(A.data['status'], 'MERGED') |
| 210 | self.assertEqual(B.data['status'], 'MERGED') |
| 211 | self.assertEqual(C.data['status'], 'MERGED') |
| 212 | self.assertEqual(A.reported, 2) |
| 213 | self.assertEqual(B.reported, 2) |
| 214 | self.assertEqual(C.reported, 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 215 | |
| 216 | def test_failed_changes(self): |
| 217 | "Test that a change behind a failed change is retested" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 218 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 219 | |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 220 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 221 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 222 | A.addApproval('code-review', 2) |
| 223 | B.addApproval('code-review', 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 224 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 225 | self.executor_server.failJob('project-test1', A) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 226 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 227 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 228 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 229 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 230 | self.assertBuilds([dict(name='project-merge', changes='1,1')]) |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 231 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 232 | self.executor_server.release('.*-merge') |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 233 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 234 | # A/project-merge is complete |
| 235 | self.assertBuilds([ |
| 236 | dict(name='project-test1', changes='1,1'), |
| 237 | dict(name='project-test2', changes='1,1'), |
| 238 | dict(name='project-merge', changes='1,1 2,1'), |
| 239 | ]) |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 240 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 241 | self.executor_server.release('.*-merge') |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 242 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 243 | # A/project-merge is complete |
| 244 | # B/project-merge is complete |
| 245 | self.assertBuilds([ |
| 246 | dict(name='project-test1', changes='1,1'), |
| 247 | dict(name='project-test2', changes='1,1'), |
| 248 | dict(name='project-test1', changes='1,1 2,1'), |
| 249 | dict(name='project-test2', changes='1,1 2,1'), |
| 250 | ]) |
| 251 | |
| 252 | # Release project-test1 for A which will fail. This will |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 253 | # abort both running B jobs and reexecute project-merge for B. |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 254 | self.builds[0].release() |
| 255 | self.waitUntilSettled() |
| 256 | |
| 257 | self.orderedRelease() |
| 258 | self.assertHistory([ |
| 259 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 260 | dict(name='project-merge', result='SUCCESS', changes='1,1 2,1'), |
| 261 | dict(name='project-test1', result='FAILURE', changes='1,1'), |
| 262 | dict(name='project-test1', result='ABORTED', changes='1,1 2,1'), |
| 263 | dict(name='project-test2', result='ABORTED', changes='1,1 2,1'), |
| 264 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 265 | dict(name='project-merge', result='SUCCESS', changes='2,1'), |
| 266 | dict(name='project-test1', result='SUCCESS', changes='2,1'), |
| 267 | dict(name='project-test2', result='SUCCESS', changes='2,1'), |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 268 | ], ordered=False) |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 269 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 270 | self.assertEqual(A.data['status'], 'NEW') |
| 271 | self.assertEqual(B.data['status'], 'MERGED') |
| 272 | self.assertEqual(A.reported, 2) |
| 273 | self.assertEqual(B.reported, 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 274 | |
| 275 | def test_independent_queues(self): |
| 276 | "Test that changes end up in the right queues" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 277 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 278 | self.executor_server.hold_jobs_in_build = True |
Zhongyue Luo | 5d55607 | 2012-09-21 02:00:47 +0900 | [diff] [blame] | 279 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 280 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 281 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 282 | A.addApproval('code-review', 2) |
| 283 | B.addApproval('code-review', 2) |
| 284 | C.addApproval('code-review', 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 285 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 286 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | f59f3cf | 2017-02-19 14:50:26 -0800 | [diff] [blame] | 287 | self.waitUntilSettled() |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 288 | |
James E. Blair | f59f3cf | 2017-02-19 14:50:26 -0800 | [diff] [blame] | 289 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 290 | self.waitUntilSettled() |
| 291 | |
| 292 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 293 | self.waitUntilSettled() |
| 294 | |
| 295 | # There should be one merge job at the head of each queue running |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 296 | self.assertBuilds([ |
| 297 | dict(name='project-merge', changes='1,1'), |
| 298 | dict(name='project-merge', changes='2,1'), |
| 299 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 300 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 301 | # Release the current merge builds |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 302 | self.builds[0].release() |
| 303 | self.waitUntilSettled() |
| 304 | self.builds[0].release() |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 305 | self.waitUntilSettled() |
| 306 | # Release the merge job for project2 which is behind project1 |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 307 | self.executor_server.release('.*-merge') |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 308 | self.waitUntilSettled() |
| 309 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 310 | # All the test builds should be running: |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 311 | self.assertBuilds([ |
| 312 | dict(name='project-test1', changes='1,1'), |
| 313 | dict(name='project-test2', changes='1,1'), |
| 314 | dict(name='project-test1', changes='2,1'), |
| 315 | dict(name='project-test2', changes='2,1'), |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 316 | dict(name='project1-project2-integration', changes='2,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 317 | dict(name='project-test1', changes='2,1 3,1'), |
| 318 | dict(name='project-test2', changes='2,1 3,1'), |
Clint Byrum | cd9393f | 2016-12-21 12:21:07 -0800 | [diff] [blame] | 319 | dict(name='project1-project2-integration', changes='2,1 3,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 320 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 321 | |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 322 | self.orderedRelease() |
| 323 | self.assertHistory([ |
| 324 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 325 | dict(name='project-merge', result='SUCCESS', changes='2,1'), |
| 326 | dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'), |
| 327 | dict(name='project-test1', result='SUCCESS', changes='1,1'), |
| 328 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 329 | dict(name='project-test1', result='SUCCESS', changes='2,1'), |
| 330 | dict(name='project-test2', result='SUCCESS', changes='2,1'), |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 331 | dict( |
| 332 | name='project1-project2-integration', |
| 333 | result='SUCCESS', |
| 334 | changes='2,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 335 | dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'), |
| 336 | dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'), |
Clint Byrum | cd9393f | 2016-12-21 12:21:07 -0800 | [diff] [blame] | 337 | dict(name='project1-project2-integration', |
| 338 | result='SUCCESS', |
| 339 | changes='2,1 3,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 340 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 341 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 342 | self.assertEqual(A.data['status'], 'MERGED') |
| 343 | self.assertEqual(B.data['status'], 'MERGED') |
| 344 | self.assertEqual(C.data['status'], 'MERGED') |
| 345 | self.assertEqual(A.reported, 2) |
| 346 | self.assertEqual(B.reported, 2) |
| 347 | self.assertEqual(C.reported, 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 348 | |
| 349 | def test_failed_change_at_head(self): |
| 350 | "Test that if a change at the head fails, jobs behind it are canceled" |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 351 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 352 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 353 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 354 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 355 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 356 | A.addApproval('code-review', 2) |
| 357 | B.addApproval('code-review', 2) |
| 358 | C.addApproval('code-review', 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 359 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 360 | self.executor_server.failJob('project-test1', A) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 361 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 362 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 363 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 364 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 365 | |
| 366 | self.waitUntilSettled() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 367 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 368 | self.assertBuilds([ |
| 369 | dict(name='project-merge', changes='1,1'), |
| 370 | ]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 371 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 372 | self.executor_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 373 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 374 | self.executor_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 375 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 376 | self.executor_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 377 | self.waitUntilSettled() |
| 378 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 379 | self.assertBuilds([ |
| 380 | dict(name='project-test1', changes='1,1'), |
| 381 | dict(name='project-test2', changes='1,1'), |
| 382 | dict(name='project-test1', changes='1,1 2,1'), |
| 383 | dict(name='project-test2', changes='1,1 2,1'), |
| 384 | dict(name='project-test1', changes='1,1 2,1 3,1'), |
| 385 | dict(name='project-test2', changes='1,1 2,1 3,1'), |
| 386 | ]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 387 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 388 | self.release(self.builds[0]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 389 | self.waitUntilSettled() |
| 390 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 391 | # project-test2, project-merge for B |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 392 | self.assertBuilds([ |
| 393 | dict(name='project-test2', changes='1,1'), |
| 394 | dict(name='project-merge', changes='2,1'), |
| 395 | ]) |
| 396 | # Unordered history comparison because the aborts can finish |
| 397 | # in any order. |
| 398 | self.assertHistory([ |
| 399 | dict(name='project-merge', result='SUCCESS', |
| 400 | changes='1,1'), |
| 401 | dict(name='project-merge', result='SUCCESS', |
| 402 | changes='1,1 2,1'), |
| 403 | dict(name='project-merge', result='SUCCESS', |
| 404 | changes='1,1 2,1 3,1'), |
| 405 | dict(name='project-test1', result='FAILURE', |
| 406 | changes='1,1'), |
| 407 | dict(name='project-test1', result='ABORTED', |
| 408 | changes='1,1 2,1'), |
| 409 | dict(name='project-test2', result='ABORTED', |
| 410 | changes='1,1 2,1'), |
| 411 | dict(name='project-test1', result='ABORTED', |
| 412 | changes='1,1 2,1 3,1'), |
| 413 | dict(name='project-test2', result='ABORTED', |
| 414 | changes='1,1 2,1 3,1'), |
| 415 | ], ordered=False) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 416 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 417 | self.executor_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 418 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 419 | self.executor_server.release('.*-merge') |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 420 | self.waitUntilSettled() |
| 421 | self.orderedRelease() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 422 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 423 | self.assertBuilds([]) |
| 424 | self.assertHistory([ |
| 425 | dict(name='project-merge', result='SUCCESS', |
| 426 | changes='1,1'), |
| 427 | dict(name='project-merge', result='SUCCESS', |
| 428 | changes='1,1 2,1'), |
| 429 | dict(name='project-merge', result='SUCCESS', |
| 430 | changes='1,1 2,1 3,1'), |
| 431 | dict(name='project-test1', result='FAILURE', |
| 432 | changes='1,1'), |
| 433 | dict(name='project-test1', result='ABORTED', |
| 434 | changes='1,1 2,1'), |
| 435 | dict(name='project-test2', result='ABORTED', |
| 436 | changes='1,1 2,1'), |
| 437 | dict(name='project-test1', result='ABORTED', |
| 438 | changes='1,1 2,1 3,1'), |
| 439 | dict(name='project-test2', result='ABORTED', |
| 440 | changes='1,1 2,1 3,1'), |
| 441 | dict(name='project-merge', result='SUCCESS', |
| 442 | changes='2,1'), |
| 443 | dict(name='project-merge', result='SUCCESS', |
| 444 | changes='2,1 3,1'), |
| 445 | dict(name='project-test2', result='SUCCESS', |
| 446 | changes='1,1'), |
| 447 | dict(name='project-test1', result='SUCCESS', |
| 448 | changes='2,1'), |
| 449 | dict(name='project-test2', result='SUCCESS', |
| 450 | changes='2,1'), |
| 451 | dict(name='project-test1', result='SUCCESS', |
| 452 | changes='2,1 3,1'), |
| 453 | dict(name='project-test2', result='SUCCESS', |
| 454 | changes='2,1 3,1'), |
| 455 | ], ordered=False) |
| 456 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 457 | self.assertEqual(A.data['status'], 'NEW') |
| 458 | self.assertEqual(B.data['status'], 'MERGED') |
| 459 | self.assertEqual(C.data['status'], 'MERGED') |
| 460 | self.assertEqual(A.reported, 2) |
| 461 | self.assertEqual(B.reported, 2) |
| 462 | self.assertEqual(C.reported, 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 463 | |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 464 | def test_failed_change_in_middle(self): |
| 465 | "Test a failed change in the middle of the queue" |
| 466 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 467 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 468 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 469 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 470 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 471 | A.addApproval('code-review', 2) |
| 472 | B.addApproval('code-review', 2) |
| 473 | C.addApproval('code-review', 2) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 474 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 475 | self.executor_server.failJob('project-test1', B) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 476 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 477 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 478 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 479 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 480 | |
| 481 | self.waitUntilSettled() |
| 482 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 483 | self.executor_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 484 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 485 | self.executor_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 486 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 487 | self.executor_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 488 | self.waitUntilSettled() |
| 489 | |
| 490 | self.assertEqual(len(self.builds), 6) |
| 491 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 492 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 493 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 494 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 495 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 496 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 497 | |
| 498 | self.release(self.builds[2]) |
| 499 | self.waitUntilSettled() |
| 500 | |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 501 | # project-test1 and project-test2 for A |
| 502 | # project-test2 for B |
| 503 | # project-merge for C (without B) |
| 504 | self.assertEqual(len(self.builds), 4) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 505 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 2) |
| 506 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 507 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 508 | self.waitUntilSettled() |
| 509 | |
| 510 | # project-test1 and project-test2 for A |
| 511 | # project-test2 for B |
| 512 | # project-test1 and project-test2 for C |
| 513 | self.assertEqual(len(self.builds), 5) |
| 514 | |
Paul Belanger | 2e2a049 | 2016-10-30 18:33:37 -0400 | [diff] [blame] | 515 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 516 | items = tenant.layout.pipelines['gate'].getAllItems() |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 517 | builds = items[0].current_build_set.getBuilds() |
| 518 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
| 519 | self.assertEqual(self.countJobResults(builds, None), 2) |
| 520 | builds = items[1].current_build_set.getBuilds() |
| 521 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
| 522 | self.assertEqual(self.countJobResults(builds, 'FAILURE'), 1) |
| 523 | self.assertEqual(self.countJobResults(builds, None), 1) |
| 524 | builds = items[2].current_build_set.getBuilds() |
| 525 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 526 | self.assertEqual(self.countJobResults(builds, None), 2) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 527 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 528 | self.executor_server.hold_jobs_in_build = False |
| 529 | self.executor_server.release() |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 530 | self.waitUntilSettled() |
| 531 | |
| 532 | self.assertEqual(len(self.builds), 0) |
| 533 | self.assertEqual(len(self.history), 12) |
| 534 | self.assertEqual(A.data['status'], 'MERGED') |
| 535 | self.assertEqual(B.data['status'], 'NEW') |
| 536 | self.assertEqual(C.data['status'], 'MERGED') |
| 537 | self.assertEqual(A.reported, 2) |
| 538 | self.assertEqual(B.reported, 2) |
| 539 | self.assertEqual(C.reported, 2) |
| 540 | |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 541 | def test_failed_change_at_head_with_queue(self): |
| 542 | "Test that if a change at the head fails, queued jobs are canceled" |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 543 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 544 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 545 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 546 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 547 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 548 | A.addApproval('code-review', 2) |
| 549 | B.addApproval('code-review', 2) |
| 550 | C.addApproval('code-review', 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 551 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 552 | self.executor_server.failJob('project-test1', A) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 553 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 554 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 555 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 556 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 557 | |
| 558 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 559 | queue = self.gearman_server.getQueue() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 560 | self.assertEqual(len(self.builds), 0) |
| 561 | self.assertEqual(len(queue), 1) |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 562 | self.assertEqual(queue[0].name, b'executor:execute') |
| 563 | job_args = json.loads(queue[0].arguments.decode('utf8')) |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 564 | self.assertEqual(job_args['job'], 'project-merge') |
| 565 | self.assertEqual(job_args['items'][0]['number'], '%d' % A.number) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 566 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 567 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 568 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 569 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 570 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 571 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 572 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 573 | queue = self.gearman_server.getQueue() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 574 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 575 | self.assertEqual(len(self.builds), 0) |
| 576 | self.assertEqual(len(queue), 6) |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 577 | |
| 578 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 579 | json.loads(queue[0].arguments.decode('utf8'))['job'], |
| 580 | 'project-test1') |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 581 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 582 | json.loads(queue[1].arguments.decode('utf8'))['job'], |
| 583 | 'project-test2') |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 584 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 585 | json.loads(queue[2].arguments.decode('utf8'))['job'], |
| 586 | 'project-test1') |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 587 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 588 | json.loads(queue[3].arguments.decode('utf8'))['job'], |
| 589 | 'project-test2') |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 590 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 591 | json.loads(queue[4].arguments.decode('utf8'))['job'], |
| 592 | 'project-test1') |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 593 | self.assertEqual( |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 594 | json.loads(queue[5].arguments.decode('utf8'))['job'], |
| 595 | 'project-test2') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 596 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 597 | self.release(queue[0]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 598 | self.waitUntilSettled() |
| 599 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 600 | self.assertEqual(len(self.builds), 0) |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 601 | queue = self.gearman_server.getQueue() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 602 | self.assertEqual(len(queue), 2) # project-test2, project-merge for B |
| 603 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 0) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 604 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 605 | self.gearman_server.hold_jobs_in_queue = False |
| 606 | self.gearman_server.release() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 607 | self.waitUntilSettled() |
| 608 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 609 | self.assertEqual(len(self.builds), 0) |
| 610 | self.assertEqual(len(self.history), 11) |
| 611 | self.assertEqual(A.data['status'], 'NEW') |
| 612 | self.assertEqual(B.data['status'], 'MERGED') |
| 613 | self.assertEqual(C.data['status'], 'MERGED') |
| 614 | self.assertEqual(A.reported, 2) |
| 615 | self.assertEqual(B.reported, 2) |
| 616 | self.assertEqual(C.reported, 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 617 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 618 | @skip("Disabled for early v3 development") |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 619 | def _test_time_database(self, iteration): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 620 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 621 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 622 | A.addApproval('code-review', 2) |
| 623 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 624 | self.waitUntilSettled() |
| 625 | time.sleep(2) |
| 626 | |
| 627 | data = json.loads(self.sched.formatStatusJSON()) |
| 628 | found_job = None |
| 629 | for pipeline in data['pipelines']: |
| 630 | if pipeline['name'] != 'gate': |
| 631 | continue |
| 632 | for queue in pipeline['change_queues']: |
| 633 | for head in queue['heads']: |
| 634 | for item in head: |
| 635 | for job in item['jobs']: |
| 636 | if job['name'] == 'project-merge': |
| 637 | found_job = job |
| 638 | break |
| 639 | |
| 640 | self.assertIsNotNone(found_job) |
| 641 | if iteration == 1: |
| 642 | self.assertIsNotNone(found_job['estimated_time']) |
| 643 | self.assertIsNone(found_job['remaining_time']) |
| 644 | else: |
| 645 | self.assertIsNotNone(found_job['estimated_time']) |
| 646 | self.assertTrue(found_job['estimated_time'] >= 2) |
| 647 | self.assertIsNotNone(found_job['remaining_time']) |
| 648 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 649 | self.executor_server.hold_jobs_in_build = False |
| 650 | self.executor_server.release() |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 651 | self.waitUntilSettled() |
| 652 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 653 | @skip("Disabled for early v3 development") |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 654 | def test_time_database(self): |
| 655 | "Test the time database" |
| 656 | |
| 657 | self._test_time_database(1) |
| 658 | self._test_time_database(2) |
| 659 | |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 660 | def test_two_failed_changes_at_head(self): |
| 661 | "Test that changes are reparented correctly if 2 fail at head" |
| 662 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 663 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 664 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 665 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 666 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 667 | A.addApproval('code-review', 2) |
| 668 | B.addApproval('code-review', 2) |
| 669 | C.addApproval('code-review', 2) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 670 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 671 | self.executor_server.failJob('project-test1', A) |
| 672 | self.executor_server.failJob('project-test1', B) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 673 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 674 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 675 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 676 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 677 | self.waitUntilSettled() |
| 678 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 679 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 680 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 681 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 682 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 683 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 684 | self.waitUntilSettled() |
| 685 | |
| 686 | self.assertEqual(len(self.builds), 6) |
| 687 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 688 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 689 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 690 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 691 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 692 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 693 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 694 | self.assertTrue(self.builds[0].hasChanges(A)) |
| 695 | self.assertTrue(self.builds[2].hasChanges(A)) |
| 696 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 697 | self.assertTrue(self.builds[4].hasChanges(A)) |
| 698 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 699 | self.assertTrue(self.builds[4].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 700 | |
| 701 | # Fail change B first |
| 702 | self.release(self.builds[2]) |
| 703 | self.waitUntilSettled() |
| 704 | |
| 705 | # restart of C after B failure |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 706 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 707 | self.waitUntilSettled() |
| 708 | |
| 709 | self.assertEqual(len(self.builds), 5) |
| 710 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 711 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 712 | self.assertEqual(self.builds[2].name, 'project-test2') |
| 713 | self.assertEqual(self.builds[3].name, 'project-test1') |
| 714 | self.assertEqual(self.builds[4].name, 'project-test2') |
| 715 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 716 | self.assertTrue(self.builds[1].hasChanges(A)) |
| 717 | self.assertTrue(self.builds[2].hasChanges(A)) |
| 718 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 719 | self.assertTrue(self.builds[4].hasChanges(A)) |
| 720 | self.assertFalse(self.builds[4].hasChanges(B)) |
| 721 | self.assertTrue(self.builds[4].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 722 | |
| 723 | # Finish running all passing jobs for change A |
| 724 | self.release(self.builds[1]) |
| 725 | self.waitUntilSettled() |
| 726 | # Fail and report change A |
| 727 | self.release(self.builds[0]) |
| 728 | self.waitUntilSettled() |
| 729 | |
| 730 | # restart of B,C after A failure |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 731 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 732 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 733 | self.executor_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 734 | self.waitUntilSettled() |
| 735 | |
| 736 | self.assertEqual(len(self.builds), 4) |
| 737 | self.assertEqual(self.builds[0].name, 'project-test1') # B |
| 738 | self.assertEqual(self.builds[1].name, 'project-test2') # B |
| 739 | self.assertEqual(self.builds[2].name, 'project-test1') # C |
| 740 | self.assertEqual(self.builds[3].name, 'project-test2') # C |
| 741 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 742 | self.assertFalse(self.builds[1].hasChanges(A)) |
| 743 | self.assertTrue(self.builds[1].hasChanges(B)) |
| 744 | self.assertFalse(self.builds[1].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 745 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 746 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 747 | # After A failed and B and C restarted, B should be back in |
| 748 | # C's tests because it has not failed yet. |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 749 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 750 | self.assertTrue(self.builds[2].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 751 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 752 | self.executor_server.hold_jobs_in_build = False |
| 753 | self.executor_server.release() |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 754 | self.waitUntilSettled() |
| 755 | |
| 756 | self.assertEqual(len(self.builds), 0) |
| 757 | self.assertEqual(len(self.history), 21) |
| 758 | self.assertEqual(A.data['status'], 'NEW') |
| 759 | self.assertEqual(B.data['status'], 'NEW') |
| 760 | self.assertEqual(C.data['status'], 'MERGED') |
| 761 | self.assertEqual(A.reported, 2) |
| 762 | self.assertEqual(B.reported, 2) |
| 763 | self.assertEqual(C.reported, 2) |
| 764 | |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 765 | def test_patch_order(self): |
| 766 | "Test that dependent patches are tested in the right order" |
| 767 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 768 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 769 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 770 | A.addApproval('code-review', 2) |
| 771 | B.addApproval('code-review', 2) |
| 772 | C.addApproval('code-review', 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 773 | |
| 774 | M2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M2') |
| 775 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 776 | M2.setMerged() |
| 777 | M1.setMerged() |
| 778 | |
| 779 | # C -> B -> A -> M1 -> M2 |
| 780 | # M2 is here to make sure it is never queried. If it is, it |
| 781 | # means zuul is walking down the entire history of merged |
| 782 | # changes. |
| 783 | |
| 784 | C.setDependsOn(B, 1) |
| 785 | B.setDependsOn(A, 1) |
| 786 | A.setDependsOn(M1, 1) |
| 787 | M1.setDependsOn(M2, 1) |
| 788 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 789 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 790 | |
| 791 | self.waitUntilSettled() |
| 792 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 793 | self.assertEqual(A.data['status'], 'NEW') |
| 794 | self.assertEqual(B.data['status'], 'NEW') |
| 795 | self.assertEqual(C.data['status'], 'NEW') |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 796 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 797 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 798 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 799 | |
| 800 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 801 | self.assertEqual(M2.queried, 0) |
| 802 | self.assertEqual(A.data['status'], 'MERGED') |
| 803 | self.assertEqual(B.data['status'], 'MERGED') |
| 804 | self.assertEqual(C.data['status'], 'MERGED') |
| 805 | self.assertEqual(A.reported, 2) |
| 806 | self.assertEqual(B.reported, 2) |
| 807 | self.assertEqual(C.reported, 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 808 | |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 809 | def test_needed_changes_enqueue(self): |
| 810 | "Test that a needed change is enqueued ahead" |
| 811 | # A Given a git tree like this, if we enqueue |
| 812 | # / \ change C, we should walk up and down the tree |
| 813 | # B G and enqueue changes in the order ABCDEFG. |
| 814 | # /|\ This is also the order that you would get if |
| 815 | # *C E F you enqueued changes in the order ABCDEFG, so |
| 816 | # / the ordering is stable across re-enqueue events. |
| 817 | # D |
| 818 | |
| 819 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 820 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 821 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 822 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 823 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
| 824 | F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F') |
| 825 | G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G') |
| 826 | B.setDependsOn(A, 1) |
| 827 | C.setDependsOn(B, 1) |
| 828 | D.setDependsOn(C, 1) |
| 829 | E.setDependsOn(B, 1) |
| 830 | F.setDependsOn(B, 1) |
| 831 | G.setDependsOn(A, 1) |
| 832 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 833 | A.addApproval('code-review', 2) |
| 834 | B.addApproval('code-review', 2) |
| 835 | C.addApproval('code-review', 2) |
| 836 | D.addApproval('code-review', 2) |
| 837 | E.addApproval('code-review', 2) |
| 838 | F.addApproval('code-review', 2) |
| 839 | G.addApproval('code-review', 2) |
| 840 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 841 | |
| 842 | self.waitUntilSettled() |
| 843 | |
| 844 | self.assertEqual(A.data['status'], 'NEW') |
| 845 | self.assertEqual(B.data['status'], 'NEW') |
| 846 | self.assertEqual(C.data['status'], 'NEW') |
| 847 | self.assertEqual(D.data['status'], 'NEW') |
| 848 | self.assertEqual(E.data['status'], 'NEW') |
| 849 | self.assertEqual(F.data['status'], 'NEW') |
| 850 | self.assertEqual(G.data['status'], 'NEW') |
| 851 | |
| 852 | # We're about to add approvals to changes without adding the |
| 853 | # triggering events to Zuul, so that we can be sure that it is |
| 854 | # enqueing the changes based on dependencies, not because of |
| 855 | # triggering events. Since it will have the changes cached |
| 856 | # already (without approvals), we need to clear the cache |
| 857 | # first. |
Paul Belanger | 593480a | 2016-11-02 19:06:28 -0400 | [diff] [blame] | 858 | for connection in self.connections.connections.values(): |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 859 | connection.maintainCache([]) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 860 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 861 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 862 | A.addApproval('approved', 1) |
| 863 | B.addApproval('approved', 1) |
| 864 | D.addApproval('approved', 1) |
| 865 | E.addApproval('approved', 1) |
| 866 | F.addApproval('approved', 1) |
| 867 | G.addApproval('approved', 1) |
| 868 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 869 | |
| 870 | for x in range(8): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 871 | self.executor_server.release('.*-merge') |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 872 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 873 | self.executor_server.hold_jobs_in_build = False |
| 874 | self.executor_server.release() |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 875 | self.waitUntilSettled() |
| 876 | |
| 877 | self.assertEqual(A.data['status'], 'MERGED') |
| 878 | self.assertEqual(B.data['status'], 'MERGED') |
| 879 | self.assertEqual(C.data['status'], 'MERGED') |
| 880 | self.assertEqual(D.data['status'], 'MERGED') |
| 881 | self.assertEqual(E.data['status'], 'MERGED') |
| 882 | self.assertEqual(F.data['status'], 'MERGED') |
| 883 | self.assertEqual(G.data['status'], 'MERGED') |
| 884 | self.assertEqual(A.reported, 2) |
| 885 | self.assertEqual(B.reported, 2) |
| 886 | self.assertEqual(C.reported, 2) |
| 887 | self.assertEqual(D.reported, 2) |
| 888 | self.assertEqual(E.reported, 2) |
| 889 | self.assertEqual(F.reported, 2) |
| 890 | self.assertEqual(G.reported, 2) |
| 891 | self.assertEqual(self.history[6].changes, |
| 892 | '1,1 2,1 3,1 4,1 5,1 6,1 7,1') |
| 893 | |
Joshua Hesketh | 850ccb6 | 2014-11-27 11:31:02 +1100 | [diff] [blame] | 894 | def test_source_cache(self): |
| 895 | "Test that the source cache operates correctly" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 896 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 897 | |
| 898 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 899 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 900 | X = self.fake_gerrit.addFakeChange('org/project', 'master', 'X') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 901 | A.addApproval('code-review', 2) |
| 902 | B.addApproval('code-review', 2) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 903 | |
| 904 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 905 | M1.setMerged() |
| 906 | |
| 907 | B.setDependsOn(A, 1) |
| 908 | A.setDependsOn(M1, 1) |
| 909 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 910 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 911 | self.fake_gerrit.addEvent(X.getPatchsetCreatedEvent(1)) |
| 912 | |
| 913 | self.waitUntilSettled() |
| 914 | |
| 915 | for build in self.builds: |
| 916 | if build.parameters['ZUUL_PIPELINE'] == 'check': |
| 917 | build.release() |
| 918 | self.waitUntilSettled() |
| 919 | for build in self.builds: |
| 920 | if build.parameters['ZUUL_PIPELINE'] == 'check': |
| 921 | build.release() |
| 922 | self.waitUntilSettled() |
| 923 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 924 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 925 | self.waitUntilSettled() |
| 926 | |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 927 | self.log.debug("len %s" % self.fake_gerrit._change_cache.keys()) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 928 | # there should still be changes in the cache |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 929 | self.assertNotEqual(len(self.fake_gerrit._change_cache.keys()), 0) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 930 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 931 | self.executor_server.hold_jobs_in_build = False |
| 932 | self.executor_server.release() |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 933 | self.waitUntilSettled() |
| 934 | |
| 935 | self.assertEqual(A.data['status'], 'MERGED') |
| 936 | self.assertEqual(B.data['status'], 'MERGED') |
| 937 | self.assertEqual(A.queried, 2) # Initial and isMerged |
| 938 | self.assertEqual(B.queried, 3) # Initial A, refresh from B, isMerged |
| 939 | |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 940 | def test_can_merge(self): |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 941 | "Test whether a change is ready to merge" |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 942 | # TODO: move to test_gerrit (this is a unit test!) |
| 943 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 944 | tenant = self.sched.abide.tenants.get('tenant-one') |
James E. Blair | 6053de4 | 2017-04-05 11:27:11 -0700 | [diff] [blame] | 945 | (trusted, project) = tenant.getProject('org/project') |
| 946 | source = project.source |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 947 | |
| 948 | # TODO(pabelanger): As we add more source / trigger APIs we should make |
| 949 | # it easier for users to create events for testing. |
| 950 | event = zuul.model.TriggerEvent() |
| 951 | event.trigger_name = 'gerrit' |
| 952 | event.change_number = '1' |
| 953 | event.patch_number = '2' |
| 954 | |
| 955 | a = source.getChange(event) |
| 956 | mgr = tenant.layout.pipelines['gate'].manager |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 957 | self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 958 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 959 | A.addApproval('code-review', 2) |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 960 | a = source.getChange(event, refresh=True) |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 961 | self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 962 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 963 | A.addApproval('approved', 1) |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 964 | a = source.getChange(event, refresh=True) |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 965 | self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 966 | |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 967 | def test_project_merge_conflict(self): |
| 968 | "Test that gate merge conflicts are handled properly" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 969 | |
| 970 | self.gearman_server.hold_jobs_in_queue = True |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 971 | A = self.fake_gerrit.addFakeChange('org/project', |
| 972 | 'master', 'A', |
| 973 | files={'conflict': 'foo'}) |
| 974 | B = self.fake_gerrit.addFakeChange('org/project', |
| 975 | 'master', 'B', |
| 976 | files={'conflict': 'bar'}) |
| 977 | C = self.fake_gerrit.addFakeChange('org/project', |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 978 | 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 979 | A.addApproval('code-review', 2) |
| 980 | B.addApproval('code-review', 2) |
| 981 | C.addApproval('code-review', 2) |
| 982 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 983 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 984 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 985 | self.waitUntilSettled() |
| 986 | |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 987 | self.assertEqual(A.reported, 1) |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 988 | self.assertEqual(C.reported, 1) |
| 989 | |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 990 | self.gearman_server.release('project-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 991 | self.waitUntilSettled() |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 992 | self.gearman_server.release('project-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 993 | self.waitUntilSettled() |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 994 | self.gearman_server.release('project-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 995 | self.waitUntilSettled() |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 996 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 997 | self.gearman_server.hold_jobs_in_queue = False |
| 998 | self.gearman_server.release() |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 999 | self.waitUntilSettled() |
| 1000 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1001 | self.assertEqual(A.data['status'], 'MERGED') |
| 1002 | self.assertEqual(B.data['status'], 'NEW') |
| 1003 | self.assertEqual(C.data['status'], 'MERGED') |
| 1004 | self.assertEqual(A.reported, 2) |
Tobias Henkel | 9842bd7 | 2017-05-16 13:40:03 +0200 | [diff] [blame] | 1005 | self.assertIn('Merge Failed', B.messages[-1]) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1006 | self.assertEqual(C.reported, 2) |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 1007 | |
| 1008 | self.assertHistory([ |
| 1009 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 1010 | dict(name='project-test1', result='SUCCESS', changes='1,1'), |
| 1011 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 1012 | dict(name='project-merge', result='SUCCESS', changes='1,1 3,1'), |
| 1013 | dict(name='project-test1', result='SUCCESS', changes='1,1 3,1'), |
| 1014 | dict(name='project-test2', result='SUCCESS', changes='1,1 3,1'), |
| 1015 | ], ordered=False) |
| 1016 | |
| 1017 | def test_delayed_merge_conflict(self): |
| 1018 | "Test that delayed check merge conflicts are handled properly" |
| 1019 | |
| 1020 | # Hold jobs in the gearman queue so that we can test whether |
James E. Blair | 1960d68 | 2017-04-28 15:44:14 -0700 | [diff] [blame] | 1021 | # the executor sucesfully merges a change based on an old |
| 1022 | # repo state (frozen by the scheduler) which would otherwise |
| 1023 | # conflict. |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 1024 | self.gearman_server.hold_jobs_in_queue = True |
| 1025 | A = self.fake_gerrit.addFakeChange('org/project', |
| 1026 | 'master', 'A', |
| 1027 | files={'conflict': 'foo'}) |
| 1028 | B = self.fake_gerrit.addFakeChange('org/project', |
| 1029 | 'master', 'B', |
| 1030 | files={'conflict': 'bar'}) |
| 1031 | C = self.fake_gerrit.addFakeChange('org/project', |
| 1032 | 'master', 'C') |
| 1033 | C.setDependsOn(B, 1) |
| 1034 | |
| 1035 | # A enters the gate queue; B and C enter the check queue |
| 1036 | A.addApproval('code-review', 2) |
| 1037 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1038 | self.waitUntilSettled() |
| 1039 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
James E. Blair | 8d144dc | 2017-05-05 10:13:45 -0700 | [diff] [blame] | 1040 | self.waitUntilSettled() |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 1041 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 1042 | self.waitUntilSettled() |
| 1043 | |
| 1044 | self.assertEqual(A.reported, 1) |
| 1045 | self.assertEqual(B.reported, 0) # Check does not report start |
| 1046 | self.assertEqual(C.reported, 0) # Check does not report start |
| 1047 | |
| 1048 | # A merges while B and C are queued in check |
| 1049 | # Release A project-merge |
| 1050 | queue = self.gearman_server.getQueue() |
| 1051 | self.release(queue[0]) |
| 1052 | self.waitUntilSettled() |
| 1053 | |
| 1054 | # Release A project-test* |
| 1055 | # gate has higher precedence, so A's test jobs are added in |
| 1056 | # front of the merge jobs for B and C |
| 1057 | queue = self.gearman_server.getQueue() |
| 1058 | self.release(queue[0]) |
| 1059 | self.release(queue[1]) |
| 1060 | self.waitUntilSettled() |
| 1061 | |
| 1062 | self.assertEqual(A.data['status'], 'MERGED') |
| 1063 | self.assertEqual(B.data['status'], 'NEW') |
| 1064 | self.assertEqual(C.data['status'], 'NEW') |
| 1065 | self.assertEqual(A.reported, 2) |
| 1066 | self.assertEqual(B.reported, 0) |
| 1067 | self.assertEqual(C.reported, 0) |
| 1068 | self.assertHistory([ |
| 1069 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 1070 | dict(name='project-test1', result='SUCCESS', changes='1,1'), |
| 1071 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 1072 | ], ordered=False) |
| 1073 | |
| 1074 | # B and C report merge conflicts |
| 1075 | # Release B project-merge |
| 1076 | queue = self.gearman_server.getQueue() |
| 1077 | self.release(queue[0]) |
| 1078 | self.waitUntilSettled() |
| 1079 | |
| 1080 | # Release C |
| 1081 | self.gearman_server.hold_jobs_in_queue = False |
| 1082 | self.gearman_server.release() |
| 1083 | self.waitUntilSettled() |
| 1084 | |
| 1085 | self.assertEqual(A.data['status'], 'MERGED') |
| 1086 | self.assertEqual(B.data['status'], 'NEW') |
| 1087 | self.assertEqual(C.data['status'], 'NEW') |
| 1088 | self.assertEqual(A.reported, 2) |
| 1089 | self.assertEqual(B.reported, 1) |
| 1090 | self.assertEqual(C.reported, 1) |
| 1091 | |
| 1092 | self.assertHistory([ |
| 1093 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 1094 | dict(name='project-test1', result='SUCCESS', changes='1,1'), |
| 1095 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
James E. Blair | 1960d68 | 2017-04-28 15:44:14 -0700 | [diff] [blame] | 1096 | dict(name='project-merge', result='SUCCESS', changes='2,1'), |
| 1097 | dict(name='project-test1', result='SUCCESS', changes='2,1'), |
| 1098 | dict(name='project-test2', result='SUCCESS', changes='2,1'), |
| 1099 | dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'), |
| 1100 | dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'), |
| 1101 | dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'), |
K Jonathan Harker | ae04e4c | 2017-03-15 19:07:11 -0700 | [diff] [blame] | 1102 | ], ordered=False) |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 1103 | |
James E. Blair | daabed2 | 2012-08-15 15:38:57 -0700 | [diff] [blame] | 1104 | def test_post(self): |
| 1105 | "Test that post jobs run" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1106 | |
Zhongyue Luo | 5d55607 | 2012-09-21 02:00:47 +0900 | [diff] [blame] | 1107 | e = { |
| 1108 | "type": "ref-updated", |
| 1109 | "submitter": { |
| 1110 | "name": "User Name", |
| 1111 | }, |
| 1112 | "refUpdate": { |
| 1113 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1114 | "newRev": "d479a0bfcb34da57a31adb2a595c0cf687812543", |
| 1115 | "refName": "master", |
| 1116 | "project": "org/project", |
| 1117 | } |
| 1118 | } |
James E. Blair | daabed2 | 2012-08-15 15:38:57 -0700 | [diff] [blame] | 1119 | self.fake_gerrit.addEvent(e) |
| 1120 | self.waitUntilSettled() |
| 1121 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1122 | job_names = [x.name for x in self.history] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1123 | self.assertEqual(len(self.history), 1) |
| 1124 | self.assertIn('project-post', job_names) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1125 | |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1126 | def test_post_ignore_deletes(self): |
| 1127 | "Test that deleting refs does not trigger post jobs" |
| 1128 | |
| 1129 | e = { |
| 1130 | "type": "ref-updated", |
| 1131 | "submitter": { |
| 1132 | "name": "User Name", |
| 1133 | }, |
| 1134 | "refUpdate": { |
| 1135 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1136 | "newRev": "0000000000000000000000000000000000000000", |
| 1137 | "refName": "master", |
| 1138 | "project": "org/project", |
| 1139 | } |
| 1140 | } |
| 1141 | self.fake_gerrit.addEvent(e) |
| 1142 | self.waitUntilSettled() |
| 1143 | |
| 1144 | job_names = [x.name for x in self.history] |
| 1145 | self.assertEqual(len(self.history), 0) |
| 1146 | self.assertNotIn('project-post', job_names) |
| 1147 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 1148 | @simple_layout('layouts/dont-ignore-ref-deletes.yaml') |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1149 | def test_post_ignore_deletes_negative(self): |
| 1150 | "Test that deleting refs does trigger post jobs" |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1151 | e = { |
| 1152 | "type": "ref-updated", |
| 1153 | "submitter": { |
| 1154 | "name": "User Name", |
| 1155 | }, |
| 1156 | "refUpdate": { |
| 1157 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1158 | "newRev": "0000000000000000000000000000000000000000", |
| 1159 | "refName": "master", |
| 1160 | "project": "org/project", |
| 1161 | } |
| 1162 | } |
| 1163 | self.fake_gerrit.addEvent(e) |
| 1164 | self.waitUntilSettled() |
| 1165 | |
| 1166 | job_names = [x.name for x in self.history] |
| 1167 | self.assertEqual(len(self.history), 1) |
| 1168 | self.assertIn('project-post', job_names) |
| 1169 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1170 | @skip("Disabled for early v3 development") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1171 | def test_build_configuration_branch_interaction(self): |
| 1172 | "Test that switching between branches works" |
| 1173 | self.test_build_configuration() |
| 1174 | self.test_build_configuration_branch() |
| 1175 | # C has been merged, undo that |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1176 | path = os.path.join(self.upstream_root, "org/project") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1177 | repo = git.Repo(path) |
| 1178 | repo.heads.master.commit = repo.commit('init') |
| 1179 | self.test_build_configuration() |
| 1180 | |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1181 | def test_dependent_changes_dequeue(self): |
| 1182 | "Test that dependent patches are not needlessly tested" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1183 | |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1184 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1185 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1186 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1187 | A.addApproval('code-review', 2) |
| 1188 | B.addApproval('code-review', 2) |
| 1189 | C.addApproval('code-review', 2) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1190 | |
| 1191 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 1192 | M1.setMerged() |
| 1193 | |
| 1194 | # C -> B -> A -> M1 |
| 1195 | |
| 1196 | C.setDependsOn(B, 1) |
| 1197 | B.setDependsOn(A, 1) |
| 1198 | A.setDependsOn(M1, 1) |
| 1199 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1200 | self.executor_server.failJob('project-merge', A) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1201 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1202 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1203 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1204 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1205 | |
| 1206 | self.waitUntilSettled() |
| 1207 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1208 | self.assertEqual(A.data['status'], 'NEW') |
| 1209 | self.assertEqual(A.reported, 2) |
| 1210 | self.assertEqual(B.data['status'], 'NEW') |
| 1211 | self.assertEqual(B.reported, 2) |
| 1212 | self.assertEqual(C.data['status'], 'NEW') |
James E. Blair | 0d3e83b | 2017-06-05 13:51:57 -0700 | [diff] [blame] | 1213 | self.assertIn('This change depends on a change that failed to merge.', |
| 1214 | C.messages[-1]) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1215 | self.assertEqual(len(self.history), 1) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1216 | |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1217 | def test_failing_dependent_changes(self): |
| 1218 | "Test that failing dependent patches are taken out of stream" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1219 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1220 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1221 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1222 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1223 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 1224 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1225 | A.addApproval('code-review', 2) |
| 1226 | B.addApproval('code-review', 2) |
| 1227 | C.addApproval('code-review', 2) |
| 1228 | D.addApproval('code-review', 2) |
| 1229 | E.addApproval('code-review', 2) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1230 | |
| 1231 | # E, D -> C -> B, A |
| 1232 | |
| 1233 | D.setDependsOn(C, 1) |
| 1234 | C.setDependsOn(B, 1) |
| 1235 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1236 | self.executor_server.failJob('project-test1', B) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1237 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1238 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1239 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
| 1240 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1241 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1242 | self.fake_gerrit.addEvent(E.addApproval('approved', 1)) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1243 | |
| 1244 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1245 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1246 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1247 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1248 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1249 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1250 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1251 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1252 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1253 | self.executor_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1254 | self.waitUntilSettled() |
| 1255 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1256 | self.executor_server.hold_jobs_in_build = False |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1257 | for build in self.builds: |
| 1258 | if build.parameters['ZUUL_CHANGE'] != '1': |
| 1259 | build.release() |
| 1260 | self.waitUntilSettled() |
| 1261 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1262 | self.executor_server.release() |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1263 | self.waitUntilSettled() |
| 1264 | |
| 1265 | self.assertEqual(A.data['status'], 'MERGED') |
| 1266 | self.assertEqual(A.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1267 | self.assertIn('Build succeeded', A.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1268 | self.assertEqual(B.data['status'], 'NEW') |
| 1269 | self.assertEqual(B.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1270 | self.assertIn('Build failed', B.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1271 | self.assertEqual(C.data['status'], 'NEW') |
| 1272 | self.assertEqual(C.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1273 | self.assertIn('depends on a change', C.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1274 | self.assertEqual(D.data['status'], 'NEW') |
| 1275 | self.assertEqual(D.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1276 | self.assertIn('depends on a change', D.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1277 | self.assertEqual(E.data['status'], 'MERGED') |
| 1278 | self.assertEqual(E.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1279 | self.assertIn('Build succeeded', E.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1280 | self.assertEqual(len(self.history), 18) |
| 1281 | |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1282 | def test_head_is_dequeued_once(self): |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1283 | "Test that if a change at the head fails it is dequeued only once" |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1284 | # If it's dequeued more than once, we should see extra |
| 1285 | # aborted jobs. |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1286 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1287 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1288 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1289 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1290 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1291 | A.addApproval('code-review', 2) |
| 1292 | B.addApproval('code-review', 2) |
| 1293 | C.addApproval('code-review', 2) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1294 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1295 | self.executor_server.failJob('project-test1', A) |
| 1296 | self.executor_server.failJob('project-test2', A) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1297 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1298 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1299 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1300 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1301 | |
| 1302 | self.waitUntilSettled() |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1303 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1304 | self.assertEqual(len(self.builds), 1) |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1305 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 1306 | self.assertTrue(self.builds[0].hasChanges(A)) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1307 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1308 | self.executor_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1309 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1310 | self.executor_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1311 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1312 | self.executor_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1313 | self.waitUntilSettled() |
| 1314 | |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1315 | self.assertEqual(len(self.builds), 6) |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1316 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 1317 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1318 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 1319 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 1320 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 1321 | self.assertEqual(self.builds[5].name, 'project-test2') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1322 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1323 | self.release(self.builds[0]) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1324 | self.waitUntilSettled() |
| 1325 | |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1326 | self.assertEqual(len(self.builds), 2) # test2, merge for B |
| 1327 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 4) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1328 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1329 | self.executor_server.hold_jobs_in_build = False |
| 1330 | self.executor_server.release() |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1331 | self.waitUntilSettled() |
| 1332 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1333 | self.assertEqual(len(self.builds), 0) |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1334 | self.assertEqual(len(self.history), 15) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1335 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1336 | self.assertEqual(A.data['status'], 'NEW') |
| 1337 | self.assertEqual(B.data['status'], 'MERGED') |
| 1338 | self.assertEqual(C.data['status'], 'MERGED') |
| 1339 | self.assertEqual(A.reported, 2) |
| 1340 | self.assertEqual(B.reported, 2) |
| 1341 | self.assertEqual(C.reported, 2) |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1342 | |
James E. Blair | cc02053 | 2017-04-19 13:04:44 -0700 | [diff] [blame] | 1343 | @simple_layout('layouts/nonvoting-job.yaml') |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1344 | def test_nonvoting_job(self): |
| 1345 | "Test that non-voting jobs don't vote." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1346 | |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1347 | A = self.fake_gerrit.addFakeChange('org/nonvoting-project', |
| 1348 | 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1349 | A.addApproval('code-review', 2) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1350 | self.executor_server.failJob('nonvoting-project-test2', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1351 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1352 | |
| 1353 | self.waitUntilSettled() |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1354 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1355 | self.assertEqual(A.data['status'], 'MERGED') |
| 1356 | self.assertEqual(A.reported, 2) |
| 1357 | self.assertEqual( |
| 1358 | self.getJobFromHistory('nonvoting-project-merge').result, |
| 1359 | 'SUCCESS') |
| 1360 | self.assertEqual( |
| 1361 | self.getJobFromHistory('nonvoting-project-test1').result, |
| 1362 | 'SUCCESS') |
| 1363 | self.assertEqual( |
| 1364 | self.getJobFromHistory('nonvoting-project-test2').result, |
| 1365 | 'FAILURE') |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1366 | |
James E. Blair | 5821bd9 | 2015-09-16 08:48:15 -0700 | [diff] [blame] | 1367 | for build in self.builds: |
| 1368 | self.assertEqual(build.parameters['ZUUL_VOTING'], '0') |
| 1369 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1370 | def test_check_queue_success(self): |
| 1371 | "Test successful check queue jobs." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1372 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1373 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1374 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1375 | |
| 1376 | self.waitUntilSettled() |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1377 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1378 | self.assertEqual(A.data['status'], 'NEW') |
| 1379 | self.assertEqual(A.reported, 1) |
| 1380 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1381 | 'SUCCESS') |
| 1382 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1383 | 'SUCCESS') |
| 1384 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1385 | 'SUCCESS') |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1386 | |
| 1387 | def test_check_queue_failure(self): |
| 1388 | "Test failed check queue jobs." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1389 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1390 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1391 | self.executor_server.failJob('project-test2', A) |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1392 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1393 | |
| 1394 | self.waitUntilSettled() |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1395 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1396 | self.assertEqual(A.data['status'], 'NEW') |
| 1397 | self.assertEqual(A.reported, 1) |
| 1398 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
James E. Blair | 78e31b3 | 2013-07-09 09:11:34 -0700 | [diff] [blame] | 1399 | 'SUCCESS') |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1400 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1401 | 'SUCCESS') |
| 1402 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1403 | 'FAILURE') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1404 | |
James E. Blair | 7cb8454 | 2017-04-19 13:35:05 -0700 | [diff] [blame] | 1405 | @simple_layout('layouts/three-projects.yaml') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1406 | def test_dependent_behind_dequeue(self): |
Clint Byrum | a962657 | 2017-02-22 14:04:00 -0500 | [diff] [blame] | 1407 | # This particular test does a large amount of merges and needs a little |
| 1408 | # more time to complete |
James E. Blair | 267e516 | 2017-04-07 10:08:20 -0700 | [diff] [blame] | 1409 | self.wait_timeout = 120 |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1410 | "test that dependent changes behind dequeued changes work" |
| 1411 | # This complicated test is a reproduction of a real life bug |
| 1412 | self.sched.reconfigure(self.config) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1413 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1414 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1415 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 1416 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 1417 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 1418 | D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') |
| 1419 | E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E') |
| 1420 | F = self.fake_gerrit.addFakeChange('org/project3', 'master', 'F') |
| 1421 | D.setDependsOn(C, 1) |
| 1422 | E.setDependsOn(D, 1) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1423 | A.addApproval('code-review', 2) |
| 1424 | B.addApproval('code-review', 2) |
| 1425 | C.addApproval('code-review', 2) |
| 1426 | D.addApproval('code-review', 2) |
| 1427 | E.addApproval('code-review', 2) |
| 1428 | F.addApproval('code-review', 2) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1429 | |
| 1430 | A.fail_merge = True |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1431 | |
| 1432 | # Change object re-use in the gerrit trigger is hidden if |
| 1433 | # changes are added in quick succession; waiting makes it more |
| 1434 | # like real life. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1435 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1436 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1437 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1438 | self.waitUntilSettled() |
| 1439 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1440 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1441 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1442 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1443 | self.waitUntilSettled() |
| 1444 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1445 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1446 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1447 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1448 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1449 | self.fake_gerrit.addEvent(E.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1450 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1451 | self.fake_gerrit.addEvent(F.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1452 | self.waitUntilSettled() |
| 1453 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1454 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1455 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1456 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1457 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1458 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1459 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1460 | self.executor_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1461 | self.waitUntilSettled() |
| 1462 | |
| 1463 | # all jobs running |
James E. Blair | e955e06 | 2012-10-08 09:49:03 -0700 | [diff] [blame] | 1464 | |
| 1465 | # Grab pointers to the jobs we want to release before |
| 1466 | # releasing any, because list indexes may change as |
| 1467 | # the jobs complete. |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1468 | a, b, c = self.builds[:3] |
James E. Blair | e955e06 | 2012-10-08 09:49:03 -0700 | [diff] [blame] | 1469 | a.release() |
| 1470 | b.release() |
| 1471 | c.release() |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1472 | self.waitUntilSettled() |
| 1473 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1474 | self.executor_server.hold_jobs_in_build = False |
| 1475 | self.executor_server.release() |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1476 | self.waitUntilSettled() |
| 1477 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1478 | self.assertEqual(A.data['status'], 'NEW') |
| 1479 | self.assertEqual(B.data['status'], 'MERGED') |
| 1480 | self.assertEqual(C.data['status'], 'MERGED') |
| 1481 | self.assertEqual(D.data['status'], 'MERGED') |
| 1482 | self.assertEqual(E.data['status'], 'MERGED') |
| 1483 | self.assertEqual(F.data['status'], 'MERGED') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1484 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1485 | self.assertEqual(A.reported, 2) |
| 1486 | self.assertEqual(B.reported, 2) |
| 1487 | self.assertEqual(C.reported, 2) |
| 1488 | self.assertEqual(D.reported, 2) |
| 1489 | self.assertEqual(E.reported, 2) |
| 1490 | self.assertEqual(F.reported, 2) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1491 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1492 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 15) |
| 1493 | self.assertEqual(len(self.history), 44) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1494 | |
| 1495 | def test_merger_repack(self): |
| 1496 | "Test that the merger works after a repack" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1497 | |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1498 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1499 | A.addApproval('code-review', 2) |
| 1500 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1501 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1502 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1503 | 'SUCCESS') |
| 1504 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1505 | 'SUCCESS') |
| 1506 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1507 | 'SUCCESS') |
| 1508 | self.assertEqual(A.data['status'], 'MERGED') |
| 1509 | self.assertEqual(A.reported, 2) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1510 | self.assertEmptyQueues() |
Paul Belanger | 5bfe9e7 | 2016-11-04 19:20:04 -0400 | [diff] [blame] | 1511 | self.build_history = [] |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1512 | |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 1513 | path = os.path.join(self.merger_src_root, "review.example.com", |
| 1514 | "org/project") |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 1515 | if os.path.exists(path): |
| 1516 | repack_repo(path) |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 1517 | path = os.path.join(self.executor_src_root, "review.example.com", |
| 1518 | "org/project") |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 1519 | if os.path.exists(path): |
| 1520 | repack_repo(path) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1521 | |
| 1522 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1523 | A.addApproval('code-review', 2) |
| 1524 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1525 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1526 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1527 | 'SUCCESS') |
| 1528 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1529 | 'SUCCESS') |
| 1530 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1531 | 'SUCCESS') |
| 1532 | self.assertEqual(A.data['status'], 'MERGED') |
| 1533 | self.assertEqual(A.reported, 2) |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1534 | |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1535 | def test_merger_repack_large_change(self): |
| 1536 | "Test that the merger works with large changes after a repack" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1537 | # https://bugs.executepad.net/zuul/+bug/1078946 |
James E. Blair | ac2c324 | 2014-01-24 13:38:51 -0800 | [diff] [blame] | 1538 | # This test assumes the repo is already cloned; make sure it is |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1539 | tenant = self.sched.abide.tenants.get('tenant-one') |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1540 | trusted, project = tenant.getProject('org/project') |
James E. Blair | 0ffa010 | 2017-03-30 13:11:33 -0700 | [diff] [blame] | 1541 | url = self.fake_gerrit.getGitUrl(project) |
James E. Blair | 8d144dc | 2017-05-05 10:13:45 -0700 | [diff] [blame] | 1542 | self.executor_server.merger._addProject('review.example.com', |
James E. Blair | 197e820 | 2017-06-09 12:54:28 -0700 | [diff] [blame] | 1543 | 'org/project', url, None) |
James E. Blair | 6df6713 | 2017-04-19 13:53:20 -0700 | [diff] [blame] | 1544 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1545 | A.addPatchset(large=True) |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 1546 | # TODOv3(jeblair): add hostname to upstream root |
| 1547 | path = os.path.join(self.upstream_root, 'org/project') |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 1548 | repack_repo(path) |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 1549 | path = os.path.join(self.merger_src_root, 'review.example.com', |
| 1550 | 'org/project') |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 1551 | if os.path.exists(path): |
| 1552 | repack_repo(path) |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 1553 | path = os.path.join(self.executor_src_root, 'review.example.com', |
| 1554 | 'org/project') |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 1555 | if os.path.exists(path): |
| 1556 | repack_repo(path) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1557 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1558 | A.addApproval('code-review', 2) |
| 1559 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1560 | self.waitUntilSettled() |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1561 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1562 | 'SUCCESS') |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1563 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1564 | 'SUCCESS') |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1565 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1566 | 'SUCCESS') |
| 1567 | self.assertEqual(A.data['status'], 'MERGED') |
| 1568 | self.assertEqual(A.reported, 2) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1569 | |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1570 | def test_new_patchset_dequeues_old(self): |
| 1571 | "Test that a new patchset causes the old to be dequeued" |
| 1572 | # D -> C (depends on B) -> B (depends on A) -> A -> M |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1573 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1574 | M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M') |
| 1575 | M.setMerged() |
| 1576 | |
| 1577 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1578 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1579 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1580 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1581 | A.addApproval('code-review', 2) |
| 1582 | B.addApproval('code-review', 2) |
| 1583 | C.addApproval('code-review', 2) |
| 1584 | D.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1585 | |
| 1586 | C.setDependsOn(B, 1) |
| 1587 | B.setDependsOn(A, 1) |
| 1588 | A.setDependsOn(M, 1) |
| 1589 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1590 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1591 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1592 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1593 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1594 | self.waitUntilSettled() |
| 1595 | |
| 1596 | B.addPatchset() |
| 1597 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1598 | self.waitUntilSettled() |
| 1599 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1600 | self.executor_server.hold_jobs_in_build = False |
| 1601 | self.executor_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1602 | self.waitUntilSettled() |
| 1603 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1604 | self.assertEqual(A.data['status'], 'MERGED') |
| 1605 | self.assertEqual(A.reported, 2) |
| 1606 | self.assertEqual(B.data['status'], 'NEW') |
| 1607 | self.assertEqual(B.reported, 2) |
| 1608 | self.assertEqual(C.data['status'], 'NEW') |
| 1609 | self.assertEqual(C.reported, 2) |
| 1610 | self.assertEqual(D.data['status'], 'MERGED') |
| 1611 | self.assertEqual(D.reported, 2) |
| 1612 | self.assertEqual(len(self.history), 9) # 3 each for A, B, D. |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1613 | |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1614 | def test_new_patchset_check(self): |
| 1615 | "Test a new patchset in check" |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1616 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1617 | self.executor_server.hold_jobs_in_build = True |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1618 | |
| 1619 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1620 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Paul Belanger | 18e5f63 | 2016-11-03 15:24:16 -0400 | [diff] [blame] | 1621 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 1622 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1623 | |
| 1624 | # Add two git-dependent changes |
| 1625 | B.setDependsOn(A, 1) |
| 1626 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1627 | self.waitUntilSettled() |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1628 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1629 | self.waitUntilSettled() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1630 | |
| 1631 | # A live item, and a non-live/live pair |
| 1632 | items = check_pipeline.getAllItems() |
| 1633 | self.assertEqual(len(items), 3) |
| 1634 | |
| 1635 | self.assertEqual(items[0].change.number, '1') |
| 1636 | self.assertEqual(items[0].change.patchset, '1') |
| 1637 | self.assertFalse(items[0].live) |
| 1638 | |
| 1639 | self.assertEqual(items[1].change.number, '2') |
| 1640 | self.assertEqual(items[1].change.patchset, '1') |
| 1641 | self.assertTrue(items[1].live) |
| 1642 | |
| 1643 | self.assertEqual(items[2].change.number, '1') |
| 1644 | self.assertEqual(items[2].change.patchset, '1') |
| 1645 | self.assertTrue(items[2].live) |
| 1646 | |
| 1647 | # Add a new patchset to A |
| 1648 | A.addPatchset() |
| 1649 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 1650 | self.waitUntilSettled() |
| 1651 | |
| 1652 | # The live copy of A,1 should be gone, but the non-live and B |
| 1653 | # should continue, and we should have a new A,2 |
| 1654 | items = check_pipeline.getAllItems() |
| 1655 | self.assertEqual(len(items), 3) |
| 1656 | |
| 1657 | self.assertEqual(items[0].change.number, '1') |
| 1658 | self.assertEqual(items[0].change.patchset, '1') |
| 1659 | self.assertFalse(items[0].live) |
| 1660 | |
| 1661 | self.assertEqual(items[1].change.number, '2') |
| 1662 | self.assertEqual(items[1].change.patchset, '1') |
| 1663 | self.assertTrue(items[1].live) |
| 1664 | |
| 1665 | self.assertEqual(items[2].change.number, '1') |
| 1666 | self.assertEqual(items[2].change.patchset, '2') |
| 1667 | self.assertTrue(items[2].live) |
| 1668 | |
| 1669 | # Add a new patchset to B |
| 1670 | B.addPatchset() |
| 1671 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1672 | self.waitUntilSettled() |
| 1673 | |
| 1674 | # The live copy of B,1 should be gone, and it's non-live copy of A,1 |
| 1675 | # but we should have a new B,2 (still based on A,1) |
| 1676 | items = check_pipeline.getAllItems() |
| 1677 | self.assertEqual(len(items), 3) |
| 1678 | |
| 1679 | self.assertEqual(items[0].change.number, '1') |
| 1680 | self.assertEqual(items[0].change.patchset, '2') |
| 1681 | self.assertTrue(items[0].live) |
| 1682 | |
| 1683 | self.assertEqual(items[1].change.number, '1') |
| 1684 | self.assertEqual(items[1].change.patchset, '1') |
| 1685 | self.assertFalse(items[1].live) |
| 1686 | |
| 1687 | self.assertEqual(items[2].change.number, '2') |
| 1688 | self.assertEqual(items[2].change.patchset, '2') |
| 1689 | self.assertTrue(items[2].live) |
| 1690 | |
| 1691 | self.builds[0].release() |
| 1692 | self.waitUntilSettled() |
| 1693 | self.builds[0].release() |
| 1694 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1695 | self.executor_server.hold_jobs_in_build = False |
| 1696 | self.executor_server.release() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1697 | self.waitUntilSettled() |
| 1698 | |
| 1699 | self.assertEqual(A.reported, 1) |
| 1700 | self.assertEqual(B.reported, 1) |
| 1701 | self.assertEqual(self.history[0].result, 'ABORTED') |
| 1702 | self.assertEqual(self.history[0].changes, '1,1') |
| 1703 | self.assertEqual(self.history[1].result, 'ABORTED') |
| 1704 | self.assertEqual(self.history[1].changes, '1,1 2,1') |
| 1705 | self.assertEqual(self.history[2].result, 'SUCCESS') |
| 1706 | self.assertEqual(self.history[2].changes, '1,2') |
| 1707 | self.assertEqual(self.history[3].result, 'SUCCESS') |
| 1708 | self.assertEqual(self.history[3].changes, '1,1 2,2') |
| 1709 | |
| 1710 | def test_abandoned_gate(self): |
| 1711 | "Test that an abandoned change is dequeued from gate" |
| 1712 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1713 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1714 | |
| 1715 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1716 | A.addApproval('code-review', 2) |
| 1717 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1718 | self.waitUntilSettled() |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1719 | self.assertEqual(len(self.builds), 1, "One job being built (on hold)") |
| 1720 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 1721 | |
| 1722 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1723 | self.waitUntilSettled() |
| 1724 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1725 | self.executor_server.release('.*-merge') |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1726 | self.waitUntilSettled() |
| 1727 | |
Arie | 5b4048c | 2016-10-05 16:12:06 +0300 | [diff] [blame] | 1728 | self.assertBuilds([]) |
| 1729 | self.assertHistory([ |
| 1730 | dict(name='project-merge', result='ABORTED', changes='1,1')], |
| 1731 | ordered=False) |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1732 | self.assertEqual(A.reported, 1, |
| 1733 | "Abandoned gate change should report only start") |
| 1734 | |
| 1735 | def test_abandoned_check(self): |
| 1736 | "Test that an abandoned change is dequeued from check" |
| 1737 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1738 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1739 | |
| 1740 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1741 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Paul Belanger | 18e5f63 | 2016-11-03 15:24:16 -0400 | [diff] [blame] | 1742 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 1743 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1744 | |
| 1745 | # Add two git-dependent changes |
| 1746 | B.setDependsOn(A, 1) |
| 1747 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1748 | self.waitUntilSettled() |
| 1749 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1750 | self.waitUntilSettled() |
| 1751 | # A live item, and a non-live/live pair |
| 1752 | items = check_pipeline.getAllItems() |
| 1753 | self.assertEqual(len(items), 3) |
| 1754 | |
| 1755 | self.assertEqual(items[0].change.number, '1') |
| 1756 | self.assertFalse(items[0].live) |
| 1757 | |
| 1758 | self.assertEqual(items[1].change.number, '2') |
| 1759 | self.assertTrue(items[1].live) |
| 1760 | |
| 1761 | self.assertEqual(items[2].change.number, '1') |
| 1762 | self.assertTrue(items[2].live) |
| 1763 | |
| 1764 | # Abandon A |
| 1765 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1766 | self.waitUntilSettled() |
| 1767 | |
| 1768 | # The live copy of A should be gone, but the non-live and B |
| 1769 | # should continue |
| 1770 | items = check_pipeline.getAllItems() |
| 1771 | self.assertEqual(len(items), 2) |
| 1772 | |
| 1773 | self.assertEqual(items[0].change.number, '1') |
| 1774 | self.assertFalse(items[0].live) |
| 1775 | |
| 1776 | self.assertEqual(items[1].change.number, '2') |
| 1777 | self.assertTrue(items[1].live) |
| 1778 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1779 | self.executor_server.hold_jobs_in_build = False |
| 1780 | self.executor_server.release() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1781 | self.waitUntilSettled() |
| 1782 | |
| 1783 | self.assertEqual(len(self.history), 4) |
| 1784 | self.assertEqual(self.history[0].result, 'ABORTED', |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1785 | 'Build should have been aborted') |
| 1786 | self.assertEqual(A.reported, 0, "Abandoned change should not report") |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1787 | self.assertEqual(B.reported, 1, "Change should report") |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1788 | |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1789 | def test_abandoned_not_timer(self): |
| 1790 | "Test that an abandoned change does not cancel timer jobs" |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 1791 | # This test can not use simple_layout because it must start |
| 1792 | # with a configuration which does not include a |
| 1793 | # timer-triggered job so that we have an opportunity to set |
| 1794 | # the hold flag before the first job. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1795 | self.executor_server.hold_jobs_in_build = True |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1796 | # Start timer trigger - also org/project |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 1797 | self.commitConfigUpdate('common-config', 'layouts/idle.yaml') |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1798 | self.sched.reconfigure(self.config) |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1799 | # The pipeline triggers every second, so we should have seen |
| 1800 | # several by now. |
| 1801 | time.sleep(5) |
| 1802 | self.waitUntilSettled() |
| 1803 | # Stop queuing timer triggered jobs so that the assertions |
| 1804 | # below don't race against more jobs being queued. |
Clint Byrum | ead6c56 | 2017-02-01 16:34:04 -0800 | [diff] [blame] | 1805 | # Must be in same repo, so overwrite config with another one |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 1806 | self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml') |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1807 | self.sched.reconfigure(self.config) |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 1808 | |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1809 | self.assertEqual(len(self.builds), 2, "Two timer jobs") |
| 1810 | |
| 1811 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1812 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1813 | self.waitUntilSettled() |
| 1814 | self.assertEqual(len(self.builds), 3, "One change plus two timer jobs") |
| 1815 | |
| 1816 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1817 | self.waitUntilSettled() |
| 1818 | |
| 1819 | self.assertEqual(len(self.builds), 2, "Two timer jobs remain") |
| 1820 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1821 | self.executor_server.release() |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1822 | self.waitUntilSettled() |
| 1823 | |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1824 | def test_zuul_url_return(self): |
| 1825 | "Test if ZUUL_URL is returning when zuul_url is set in zuul.conf" |
James E. Blair | 4076e2b | 2014-01-28 12:42:20 -0800 | [diff] [blame] | 1826 | self.assertTrue(self.sched.config.has_option('merger', 'zuul_url')) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1827 | self.executor_server.hold_jobs_in_build = True |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1828 | |
| 1829 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1830 | A.addApproval('code-review', 2) |
| 1831 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1832 | self.waitUntilSettled() |
| 1833 | |
| 1834 | self.assertEqual(len(self.builds), 1) |
| 1835 | for build in self.builds: |
| 1836 | self.assertTrue('ZUUL_URL' in build.parameters) |
| 1837 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1838 | self.executor_server.hold_jobs_in_build = False |
| 1839 | self.executor_server.release() |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1840 | self.waitUntilSettled() |
| 1841 | |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1842 | def test_new_patchset_dequeues_old_on_head(self): |
| 1843 | "Test that a new patchset causes the old to be dequeued (at head)" |
| 1844 | # D -> C (depends on B) -> B (depends on A) -> A -> M |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1845 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1846 | M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M') |
| 1847 | M.setMerged() |
| 1848 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1849 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1850 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1851 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1852 | A.addApproval('code-review', 2) |
| 1853 | B.addApproval('code-review', 2) |
| 1854 | C.addApproval('code-review', 2) |
| 1855 | D.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1856 | |
| 1857 | C.setDependsOn(B, 1) |
| 1858 | B.setDependsOn(A, 1) |
| 1859 | A.setDependsOn(M, 1) |
| 1860 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1861 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1862 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1863 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1864 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1865 | self.waitUntilSettled() |
| 1866 | |
| 1867 | A.addPatchset() |
| 1868 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 1869 | self.waitUntilSettled() |
| 1870 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1871 | self.executor_server.hold_jobs_in_build = False |
| 1872 | self.executor_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1873 | self.waitUntilSettled() |
| 1874 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1875 | self.assertEqual(A.data['status'], 'NEW') |
| 1876 | self.assertEqual(A.reported, 2) |
| 1877 | self.assertEqual(B.data['status'], 'NEW') |
| 1878 | self.assertEqual(B.reported, 2) |
| 1879 | self.assertEqual(C.data['status'], 'NEW') |
| 1880 | self.assertEqual(C.reported, 2) |
| 1881 | self.assertEqual(D.data['status'], 'MERGED') |
| 1882 | self.assertEqual(D.reported, 2) |
| 1883 | self.assertEqual(len(self.history), 7) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1884 | |
| 1885 | def test_new_patchset_dequeues_old_without_dependents(self): |
| 1886 | "Test that a new patchset causes only the old to be dequeued" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1887 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1888 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1889 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1890 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1891 | A.addApproval('code-review', 2) |
| 1892 | B.addApproval('code-review', 2) |
| 1893 | C.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1894 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1895 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1896 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1897 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1898 | self.waitUntilSettled() |
| 1899 | |
| 1900 | B.addPatchset() |
| 1901 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1902 | self.waitUntilSettled() |
| 1903 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1904 | self.executor_server.hold_jobs_in_build = False |
| 1905 | self.executor_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1906 | self.waitUntilSettled() |
| 1907 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1908 | self.assertEqual(A.data['status'], 'MERGED') |
| 1909 | self.assertEqual(A.reported, 2) |
| 1910 | self.assertEqual(B.data['status'], 'NEW') |
| 1911 | self.assertEqual(B.reported, 2) |
| 1912 | self.assertEqual(C.data['status'], 'MERGED') |
| 1913 | self.assertEqual(C.reported, 2) |
| 1914 | self.assertEqual(len(self.history), 9) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1915 | |
| 1916 | def test_new_patchset_dequeues_old_independent_queue(self): |
| 1917 | "Test that a new patchset causes the old to be dequeued (independent)" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1918 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1919 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1920 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1921 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1922 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1923 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1924 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 1925 | self.waitUntilSettled() |
| 1926 | |
| 1927 | B.addPatchset() |
| 1928 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1929 | self.waitUntilSettled() |
| 1930 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1931 | self.executor_server.hold_jobs_in_build = False |
| 1932 | self.executor_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1933 | self.waitUntilSettled() |
| 1934 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1935 | self.assertEqual(A.data['status'], 'NEW') |
| 1936 | self.assertEqual(A.reported, 1) |
| 1937 | self.assertEqual(B.data['status'], 'NEW') |
| 1938 | self.assertEqual(B.reported, 1) |
| 1939 | self.assertEqual(C.data['status'], 'NEW') |
| 1940 | self.assertEqual(C.reported, 1) |
| 1941 | self.assertEqual(len(self.history), 10) |
| 1942 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 1943 | |
James E. Blair | cc02053 | 2017-04-19 13:04:44 -0700 | [diff] [blame] | 1944 | @simple_layout('layouts/noop-job.yaml') |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 1945 | def test_noop_job(self): |
| 1946 | "Test that the internal noop job works" |
| 1947 | A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1948 | A.addApproval('code-review', 2) |
| 1949 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 1950 | self.waitUntilSettled() |
| 1951 | |
| 1952 | self.assertEqual(len(self.gearman_server.getQueue()), 0) |
| 1953 | self.assertTrue(self.sched._areAllBuildsComplete()) |
| 1954 | self.assertEqual(len(self.history), 0) |
| 1955 | self.assertEqual(A.data['status'], 'MERGED') |
| 1956 | self.assertEqual(A.reported, 2) |
| 1957 | |
James E. Blair | 06cc392 | 2017-04-19 10:08:10 -0700 | [diff] [blame] | 1958 | @simple_layout('layouts/no-jobs-project.yaml') |
Evgeny Antyshev | d6e546c | 2015-06-11 15:13:57 +0000 | [diff] [blame] | 1959 | def test_no_job_project(self): |
| 1960 | "Test that reports with no jobs don't get sent" |
| 1961 | A = self.fake_gerrit.addFakeChange('org/no-jobs-project', |
| 1962 | 'master', 'A') |
| 1963 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1964 | self.waitUntilSettled() |
| 1965 | |
| 1966 | # Change wasn't reported to |
| 1967 | self.assertEqual(A.reported, False) |
| 1968 | |
| 1969 | # Check queue is empty afterwards |
Clint Byrum | 883c30e | 2016-12-13 11:54:33 -0800 | [diff] [blame] | 1970 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 1971 | check_pipeline = tenant.layout.pipelines['check'] |
Evgeny Antyshev | d6e546c | 2015-06-11 15:13:57 +0000 | [diff] [blame] | 1972 | items = check_pipeline.getAllItems() |
| 1973 | self.assertEqual(len(items), 0) |
| 1974 | |
| 1975 | self.assertEqual(len(self.history), 0) |
| 1976 | |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 1977 | def test_zuul_refs(self): |
| 1978 | "Test that zuul refs exist and have the right changes" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1979 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 1980 | M1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'M1') |
| 1981 | M1.setMerged() |
| 1982 | M2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'M2') |
| 1983 | M2.setMerged() |
| 1984 | |
| 1985 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 1986 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 1987 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 1988 | D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1989 | A.addApproval('code-review', 2) |
| 1990 | B.addApproval('code-review', 2) |
| 1991 | C.addApproval('code-review', 2) |
| 1992 | D.addApproval('code-review', 2) |
| 1993 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1994 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1995 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1996 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 1997 | |
| 1998 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 1999 | self.executor_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2000 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2001 | self.executor_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2002 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2003 | self.executor_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2004 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2005 | self.executor_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2006 | self.waitUntilSettled() |
| 2007 | |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2008 | a_zref = b_zref = c_zref = d_zref = None |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2009 | a_build = b_build = c_build = d_build = None |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 2010 | for x in self.builds: |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2011 | if x.parameters['ZUUL_CHANGE'] == '3': |
| 2012 | a_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2013 | a_build = x |
| 2014 | elif x.parameters['ZUUL_CHANGE'] == '4': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2015 | b_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2016 | b_build = x |
| 2017 | elif x.parameters['ZUUL_CHANGE'] == '5': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2018 | c_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2019 | c_build = x |
| 2020 | elif x.parameters['ZUUL_CHANGE'] == '6': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2021 | d_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2022 | d_build = x |
| 2023 | if a_build and b_build and c_build and d_build: |
| 2024 | break |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2025 | |
| 2026 | # There are... four... refs. |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2027 | self.assertIsNotNone(a_zref) |
| 2028 | self.assertIsNotNone(b_zref) |
| 2029 | self.assertIsNotNone(c_zref) |
| 2030 | self.assertIsNotNone(d_zref) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2031 | |
| 2032 | # And they should all be different |
| 2033 | refs = set([a_zref, b_zref, c_zref, d_zref]) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2034 | self.assertEqual(len(refs), 4) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2035 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2036 | # should have a, not b, and should not be in project2 |
| 2037 | self.assertTrue(a_build.hasChanges(A)) |
| 2038 | self.assertFalse(a_build.hasChanges(B, M2)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2039 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2040 | # should have a and b, and should not be in project2 |
| 2041 | self.assertTrue(b_build.hasChanges(A, B)) |
| 2042 | self.assertFalse(b_build.hasChanges(M2)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2043 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2044 | # should have a and b in 1, c in 2 |
| 2045 | self.assertTrue(c_build.hasChanges(A, B, C)) |
| 2046 | self.assertFalse(c_build.hasChanges(D)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2047 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2048 | # should have a and b in 1, c and d in 2 |
| 2049 | self.assertTrue(d_build.hasChanges(A, B, C, D)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2050 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2051 | self.executor_server.hold_jobs_in_build = False |
| 2052 | self.executor_server.release() |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2053 | self.waitUntilSettled() |
| 2054 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2055 | self.assertEqual(A.data['status'], 'MERGED') |
| 2056 | self.assertEqual(A.reported, 2) |
| 2057 | self.assertEqual(B.data['status'], 'MERGED') |
| 2058 | self.assertEqual(B.reported, 2) |
| 2059 | self.assertEqual(C.data['status'], 'MERGED') |
| 2060 | self.assertEqual(C.reported, 2) |
| 2061 | self.assertEqual(D.data['status'], 'MERGED') |
| 2062 | self.assertEqual(D.reported, 2) |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2063 | |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2064 | def test_rerun_on_error(self): |
| 2065 | "Test that if a worker fails to run a job, it is run again" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2066 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2067 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2068 | A.addApproval('code-review', 2) |
| 2069 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2070 | self.waitUntilSettled() |
| 2071 | |
James E. Blair | 412fba8 | 2017-01-26 15:00:50 -0800 | [diff] [blame] | 2072 | self.builds[0].requeue = True |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2073 | self.executor_server.hold_jobs_in_build = False |
| 2074 | self.executor_server.release() |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2075 | self.waitUntilSettled() |
James E. Blair | 412fba8 | 2017-01-26 15:00:50 -0800 | [diff] [blame] | 2076 | self.assertEqual(self.countJobResults(self.history, None), 1) |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2077 | self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3) |
| 2078 | |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2079 | def test_statsd(self): |
| 2080 | "Test each of the statsd methods used in the scheduler" |
| 2081 | import extras |
| 2082 | statsd = extras.try_import('statsd.statsd') |
| 2083 | statsd.incr('test-incr') |
| 2084 | statsd.timing('test-timing', 3) |
Alex Gaynor | 813d39b | 2014-05-17 16:17:16 -0700 | [diff] [blame] | 2085 | statsd.gauge('test-gauge', 12) |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2086 | self.assertReportedStat('test-incr', '1|c') |
| 2087 | self.assertReportedStat('test-timing', '3|ms') |
Alex Gaynor | 813d39b | 2014-05-17 16:17:16 -0700 | [diff] [blame] | 2088 | self.assertReportedStat('test-gauge', '12|g') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2089 | |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2090 | def test_stuck_job_cleanup(self): |
| 2091 | "Test that pending jobs are cleaned up if removed from layout" |
Clint Byrum | 678e2c3 | 2017-03-16 16:27:21 -0700 | [diff] [blame] | 2092 | |
| 2093 | # We want to hold the project-merge job that the fake change enqueues |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2094 | self.gearman_server.hold_jobs_in_queue = True |
| 2095 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2096 | A.addApproval('code-review', 2) |
| 2097 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2098 | self.waitUntilSettled() |
Clint Byrum | 678e2c3 | 2017-03-16 16:27:21 -0700 | [diff] [blame] | 2099 | # The assertion is that we have one job in the queue, project-merge |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2100 | self.assertEqual(len(self.gearman_server.getQueue()), 1) |
| 2101 | |
James E. Blair | 31cb3e8 | 2017-04-20 13:08:56 -0700 | [diff] [blame] | 2102 | self.commitConfigUpdate('common-config', 'layouts/no-jobs.yaml') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2103 | self.sched.reconfigure(self.config) |
| 2104 | self.waitUntilSettled() |
| 2105 | |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 2106 | self.gearman_server.release('gate-noop') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2107 | self.waitUntilSettled() |
Clint Byrum | 678e2c3 | 2017-03-16 16:27:21 -0700 | [diff] [blame] | 2108 | # asserting that project-merge is removed from queue |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2109 | self.assertEqual(len(self.gearman_server.getQueue()), 0) |
| 2110 | self.assertTrue(self.sched._areAllBuildsComplete()) |
| 2111 | |
| 2112 | self.assertEqual(len(self.history), 1) |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 2113 | self.assertEqual(self.history[0].name, 'gate-noop') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2114 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2115 | |
James E. Blair | 879dafb | 2015-07-17 14:04:49 -0700 | [diff] [blame] | 2116 | def test_file_head(self): |
| 2117 | # This is a regression test for an observed bug. A change |
| 2118 | # with a file named "HEAD" in the root directory of the repo |
| 2119 | # was processed by a merger. It then was unable to reset the |
| 2120 | # repo because of: |
| 2121 | # GitCommandError: 'git reset --hard HEAD' returned |
| 2122 | # with exit code 128 |
| 2123 | # stderr: 'fatal: ambiguous argument 'HEAD': both revision |
| 2124 | # and filename |
| 2125 | # Use '--' to separate filenames from revisions' |
| 2126 | |
| 2127 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Paul Belanger | a91095f | 2016-11-04 19:28:48 -0400 | [diff] [blame] | 2128 | A.addPatchset({'HEAD': ''}) |
James E. Blair | 879dafb | 2015-07-17 14:04:49 -0700 | [diff] [blame] | 2129 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 2130 | |
| 2131 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 2132 | self.waitUntilSettled() |
| 2133 | |
| 2134 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 2135 | self.waitUntilSettled() |
| 2136 | |
| 2137 | self.assertIn('Build succeeded', A.messages[0]) |
| 2138 | self.assertIn('Build succeeded', B.messages[0]) |
| 2139 | |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2140 | def test_file_jobs(self): |
| 2141 | "Test that file jobs run only when appropriate" |
| 2142 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Adam Gandelman | 5661bda | 2017-02-03 15:58:03 -0800 | [diff] [blame] | 2143 | A.addPatchset({'pip-requires': 'foo'}) |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2144 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2145 | A.addApproval('code-review', 2) |
| 2146 | B.addApproval('code-review', 2) |
| 2147 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 2148 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2149 | self.waitUntilSettled() |
| 2150 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 2151 | testfile_jobs = [x for x in self.history |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2152 | if x.name == 'project-testfile'] |
| 2153 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2154 | self.assertEqual(len(testfile_jobs), 1) |
| 2155 | self.assertEqual(testfile_jobs[0].changes, '1,2') |
| 2156 | self.assertEqual(A.data['status'], 'MERGED') |
| 2157 | self.assertEqual(A.reported, 2) |
| 2158 | self.assertEqual(B.data['status'], 'MERGED') |
| 2159 | self.assertEqual(B.reported, 2) |
James E. Blair | 3c5e5b5 | 2013-04-26 11:17:03 -0700 | [diff] [blame] | 2160 | |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2161 | def _test_irrelevant_files_jobs(self, should_skip): |
| 2162 | "Test that jobs with irrelevant-files filter run only when appropriate" |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2163 | if should_skip: |
| 2164 | files = {'ignoreme': 'ignored\n'} |
| 2165 | else: |
| 2166 | files = {'respectme': 'please!\n'} |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2167 | |
| 2168 | change = self.fake_gerrit.addFakeChange('org/project', |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2169 | 'master', |
| 2170 | 'test irrelevant-files', |
| 2171 | files=files) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2172 | self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1)) |
| 2173 | self.waitUntilSettled() |
| 2174 | |
| 2175 | tested_change_ids = [x.changes[0] for x in self.history |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2176 | if x.name == 'project-test-irrelevant-files'] |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2177 | |
| 2178 | if should_skip: |
| 2179 | self.assertEqual([], tested_change_ids) |
| 2180 | else: |
| 2181 | self.assertIn(change.data['number'], tested_change_ids) |
| 2182 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 2183 | @simple_layout('layouts/irrelevant-files.yaml') |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2184 | def test_irrelevant_files_match_skips_job(self): |
| 2185 | self._test_irrelevant_files_jobs(should_skip=True) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2186 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 2187 | @simple_layout('layouts/irrelevant-files.yaml') |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2188 | def test_irrelevant_files_no_match_runs_job(self): |
| 2189 | self._test_irrelevant_files_jobs(should_skip=False) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2190 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 2191 | @simple_layout('layouts/inheritance.yaml') |
Clint Byrum | 8549360 | 2016-11-18 11:59:47 -0800 | [diff] [blame] | 2192 | def test_inherited_jobs_keep_matchers(self): |
Clint Byrum | 8549360 | 2016-11-18 11:59:47 -0800 | [diff] [blame] | 2193 | files = {'ignoreme': 'ignored\n'} |
| 2194 | |
| 2195 | change = self.fake_gerrit.addFakeChange('org/project', |
| 2196 | 'master', |
| 2197 | 'test irrelevant-files', |
| 2198 | files=files) |
| 2199 | self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1)) |
| 2200 | self.waitUntilSettled() |
| 2201 | |
| 2202 | run_jobs = set([build.name for build in self.history]) |
| 2203 | |
| 2204 | self.assertEqual(set(['project-test-nomatch-starts-empty', |
| 2205 | 'project-test-nomatch-starts-full']), run_jobs) |
| 2206 | |
James E. Blair | c8a1e05 | 2014-02-25 09:29:26 -0800 | [diff] [blame] | 2207 | def test_queue_names(self): |
| 2208 | "Test shared change queue names" |
Paul Belanger | 8e68fc2 | 2017-02-06 16:24:49 -0500 | [diff] [blame] | 2209 | tenant = self.sched.abide.tenants.get('tenant-one') |
James E. Blair | 6053de4 | 2017-04-05 11:27:11 -0700 | [diff] [blame] | 2210 | (trusted, project1) = tenant.getProject('org/project1') |
| 2211 | (trusted, project2) = tenant.getProject('org/project2') |
Paul Belanger | 8e68fc2 | 2017-02-06 16:24:49 -0500 | [diff] [blame] | 2212 | q1 = tenant.layout.pipelines['gate'].getQueue(project1) |
| 2213 | q2 = tenant.layout.pipelines['gate'].getQueue(project2) |
| 2214 | self.assertEqual(q1.name, 'integrated') |
| 2215 | self.assertEqual(q2.name, 'integrated') |
James E. Blair | c8a1e05 | 2014-02-25 09:29:26 -0800 | [diff] [blame] | 2216 | |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2217 | def test_queue_precedence(self): |
| 2218 | "Test that queue precedence works" |
| 2219 | |
| 2220 | self.gearman_server.hold_jobs_in_queue = True |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2221 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2222 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2223 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2224 | A.addApproval('code-review', 2) |
| 2225 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2226 | |
| 2227 | self.waitUntilSettled() |
| 2228 | self.gearman_server.hold_jobs_in_queue = False |
| 2229 | self.gearman_server.release() |
| 2230 | self.waitUntilSettled() |
| 2231 | |
James E. Blair | 8de58bd | 2013-07-18 16:23:33 -0700 | [diff] [blame] | 2232 | # Run one build at a time to ensure non-race order: |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 2233 | self.orderedRelease() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2234 | self.executor_server.hold_jobs_in_build = False |
James E. Blair | 8de58bd | 2013-07-18 16:23:33 -0700 | [diff] [blame] | 2235 | self.waitUntilSettled() |
| 2236 | |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2237 | self.log.debug(self.history) |
| 2238 | self.assertEqual(self.history[0].pipeline, 'gate') |
| 2239 | self.assertEqual(self.history[1].pipeline, 'check') |
| 2240 | self.assertEqual(self.history[2].pipeline, 'gate') |
| 2241 | self.assertEqual(self.history[3].pipeline, 'gate') |
| 2242 | self.assertEqual(self.history[4].pipeline, 'check') |
| 2243 | self.assertEqual(self.history[5].pipeline, 'check') |
| 2244 | |
Clark Boylan | a5edbe4 | 2014-06-03 16:39:10 -0700 | [diff] [blame] | 2245 | def test_json_status(self): |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2246 | "Test that we can retrieve JSON status info" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2247 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2248 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2249 | A.addApproval('code-review', 2) |
| 2250 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2251 | self.waitUntilSettled() |
| 2252 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2253 | self.executor_server.release('project-merge') |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2254 | self.waitUntilSettled() |
| 2255 | |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2256 | port = self.webapp.server.socket.getsockname()[1] |
| 2257 | |
Adam Gandelman | 77a12c7 | 2017-02-03 17:43:43 -0800 | [diff] [blame] | 2258 | req = urllib.request.Request( |
| 2259 | "http://localhost:%s/tenant-one/status" % port) |
Morgan Fainberg | 293f7f8 | 2016-05-30 14:01:22 -0700 | [diff] [blame] | 2260 | f = urllib.request.urlopen(req) |
Clark Boylan | aa4f2e7 | 2014-06-03 21:22:40 -0700 | [diff] [blame] | 2261 | headers = f.info() |
| 2262 | self.assertIn('Content-Length', headers) |
| 2263 | self.assertIn('Content-Type', headers) |
Sachi King | dc963fc | 2016-03-23 16:00:33 +1100 | [diff] [blame] | 2264 | self.assertIsNotNone(re.match('^application/json(; charset=UTF-8)?$', |
| 2265 | headers['Content-Type'])) |
Timo Tijhof | 0ebd293 | 2015-04-02 12:11:21 +0100 | [diff] [blame] | 2266 | self.assertIn('Access-Control-Allow-Origin', headers) |
| 2267 | self.assertIn('Cache-Control', headers) |
Clark Boylan | aa4f2e7 | 2014-06-03 21:22:40 -0700 | [diff] [blame] | 2268 | self.assertIn('Last-Modified', headers) |
Timo Tijhof | 0ebd293 | 2015-04-02 12:11:21 +0100 | [diff] [blame] | 2269 | self.assertIn('Expires', headers) |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 2270 | data = f.read().decode('utf8') |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2271 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2272 | self.executor_server.hold_jobs_in_build = False |
| 2273 | self.executor_server.release() |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2274 | self.waitUntilSettled() |
| 2275 | |
| 2276 | data = json.loads(data) |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2277 | status_jobs = [] |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2278 | for p in data['pipelines']: |
| 2279 | for q in p['change_queues']: |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 2280 | if p['name'] in ['gate', 'conflict']: |
Clark Boylan | af2476f | 2014-01-23 14:47:36 -0800 | [diff] [blame] | 2281 | self.assertEqual(q['window'], 20) |
| 2282 | else: |
| 2283 | self.assertEqual(q['window'], 0) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2284 | for head in q['heads']: |
| 2285 | for change in head: |
Clark Boylan | af2476f | 2014-01-23 14:47:36 -0800 | [diff] [blame] | 2286 | self.assertTrue(change['active']) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2287 | self.assertEqual(change['id'], '1,1') |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2288 | for job in change['jobs']: |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2289 | status_jobs.append(job) |
| 2290 | self.assertEqual('project-merge', status_jobs[0]['name']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2291 | # TODO(mordred) pull uuids from self.builds |
| 2292 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[0]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2293 | status_jobs[0]['url']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2294 | # TOOD(mordred) configure a success-url on the base job |
| 2295 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[0]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2296 | status_jobs[0]['report_url']) |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2297 | self.assertEqual('project-test1', status_jobs[1]['name']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2298 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[1]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2299 | status_jobs[1]['url']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2300 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[1]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2301 | status_jobs[1]['report_url']) |
| 2302 | |
| 2303 | self.assertEqual('project-test2', status_jobs[2]['name']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2304 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[2]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2305 | status_jobs[2]['url']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 2306 | self.assertEqual('finger://zl.example.com/%s' % status_jobs[2]['uuid'], |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2307 | status_jobs[2]['report_url']) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2308 | |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2309 | def test_live_reconfiguration(self): |
| 2310 | "Test that live reconfiguration works" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2311 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2312 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2313 | A.addApproval('code-review', 2) |
| 2314 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2315 | self.waitUntilSettled() |
| 2316 | |
| 2317 | self.sched.reconfigure(self.config) |
James E. Blair | bd96363 | 2017-02-01 09:58:14 -0800 | [diff] [blame] | 2318 | self.waitUntilSettled() |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2319 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2320 | self.executor_server.hold_jobs_in_build = False |
| 2321 | self.executor_server.release() |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2322 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2323 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2324 | 'SUCCESS') |
| 2325 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2326 | 'SUCCESS') |
| 2327 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2328 | 'SUCCESS') |
| 2329 | self.assertEqual(A.data['status'], 'MERGED') |
| 2330 | self.assertEqual(A.reported, 2) |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2331 | |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2332 | def test_live_reconfiguration_merge_conflict(self): |
| 2333 | # A real-world bug: a change in a gate queue has a merge |
| 2334 | # conflict and a job is added to its project while it's |
| 2335 | # sitting in the queue. The job gets added to the change and |
| 2336 | # enqueued and the change gets stuck. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2337 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2338 | |
| 2339 | # This change is fine. It's here to stop the queue long |
| 2340 | # enough for the next change to be subject to the |
| 2341 | # reconfiguration, as well as to provide a conflict for the |
| 2342 | # next change. This change will succeed and merge. |
| 2343 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Clint Byrum | 073c00b | 2017-05-01 13:41:23 -0700 | [diff] [blame] | 2344 | A.addPatchset({'conflict': 'A'}) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2345 | A.addApproval('code-review', 2) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2346 | |
| 2347 | # This change will be in merge conflict. During the |
| 2348 | # reconfiguration, we will add a job. We want to make sure |
| 2349 | # that doesn't cause it to get stuck. |
| 2350 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Clint Byrum | 073c00b | 2017-05-01 13:41:23 -0700 | [diff] [blame] | 2351 | B.addPatchset({'conflict': 'B'}) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2352 | B.addApproval('code-review', 2) |
James E. Blair | 4eb21fa | 2015-07-27 14:56:47 -0700 | [diff] [blame] | 2353 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2354 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 2355 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2356 | |
| 2357 | self.waitUntilSettled() |
| 2358 | |
| 2359 | # No jobs have run yet |
| 2360 | self.assertEqual(A.data['status'], 'NEW') |
| 2361 | self.assertEqual(A.reported, 1) |
| 2362 | self.assertEqual(B.data['status'], 'NEW') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2363 | self.assertEqual(len(self.history), 0) |
| 2364 | |
| 2365 | # Add the "project-test3" job. |
Clint Byrum | 073c00b | 2017-05-01 13:41:23 -0700 | [diff] [blame] | 2366 | self.commitConfigUpdate('common-config', |
| 2367 | 'layouts/live-reconfiguration-add-job.yaml') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2368 | self.sched.reconfigure(self.config) |
| 2369 | self.waitUntilSettled() |
| 2370 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2371 | self.executor_server.hold_jobs_in_build = False |
| 2372 | self.executor_server.release() |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2373 | self.waitUntilSettled() |
| 2374 | |
| 2375 | self.assertEqual(A.data['status'], 'MERGED') |
| 2376 | self.assertEqual(A.reported, 2) |
| 2377 | self.assertEqual(B.data['status'], 'NEW') |
Tobias Henkel | 9842bd7 | 2017-05-16 13:40:03 +0200 | [diff] [blame] | 2378 | self.assertIn('Merge Failed', B.messages[-1]) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2379 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2380 | 'SUCCESS') |
| 2381 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2382 | 'SUCCESS') |
| 2383 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2384 | 'SUCCESS') |
| 2385 | self.assertEqual(self.getJobFromHistory('project-test3').result, |
| 2386 | 'SUCCESS') |
| 2387 | self.assertEqual(len(self.history), 4) |
| 2388 | |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2389 | def test_live_reconfiguration_failed_root(self): |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2390 | # An extrapolation of test_live_reconfiguration_merge_conflict |
| 2391 | # that tests a job added to a job tree with a failed root does |
| 2392 | # not run. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2393 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2394 | |
| 2395 | # This change is fine. It's here to stop the queue long |
| 2396 | # enough for the next change to be subject to the |
| 2397 | # reconfiguration. This change will succeed and merge. |
| 2398 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Clint Byrum | 3147d65 | 2017-05-01 14:01:42 -0700 | [diff] [blame] | 2399 | A.addPatchset({'conflict': 'A'}) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2400 | A.addApproval('code-review', 2) |
| 2401 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2402 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2403 | self.executor_server.release('.*-merge') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2404 | self.waitUntilSettled() |
| 2405 | |
| 2406 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2407 | self.executor_server.failJob('project-merge', B) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2408 | B.addApproval('code-review', 2) |
| 2409 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2410 | self.waitUntilSettled() |
| 2411 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2412 | self.executor_server.release('.*-merge') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2413 | self.waitUntilSettled() |
| 2414 | |
| 2415 | # Both -merge jobs have run, but no others. |
| 2416 | self.assertEqual(A.data['status'], 'NEW') |
| 2417 | self.assertEqual(A.reported, 1) |
| 2418 | self.assertEqual(B.data['status'], 'NEW') |
| 2419 | self.assertEqual(B.reported, 1) |
| 2420 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2421 | self.assertEqual(self.history[0].name, 'project-merge') |
| 2422 | self.assertEqual(self.history[1].result, 'FAILURE') |
| 2423 | self.assertEqual(self.history[1].name, 'project-merge') |
| 2424 | self.assertEqual(len(self.history), 2) |
| 2425 | |
| 2426 | # Add the "project-test3" job. |
Clint Byrum | 3147d65 | 2017-05-01 14:01:42 -0700 | [diff] [blame] | 2427 | self.commitConfigUpdate('common-config', |
| 2428 | 'layouts/live-reconfiguration-add-job.yaml') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2429 | self.sched.reconfigure(self.config) |
| 2430 | self.waitUntilSettled() |
| 2431 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2432 | self.executor_server.hold_jobs_in_build = False |
| 2433 | self.executor_server.release() |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2434 | self.waitUntilSettled() |
| 2435 | |
| 2436 | self.assertEqual(A.data['status'], 'MERGED') |
| 2437 | self.assertEqual(A.reported, 2) |
| 2438 | self.assertEqual(B.data['status'], 'NEW') |
| 2439 | self.assertEqual(B.reported, 2) |
| 2440 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2441 | self.assertEqual(self.history[0].name, 'project-merge') |
| 2442 | self.assertEqual(self.history[1].result, 'FAILURE') |
| 2443 | self.assertEqual(self.history[1].name, 'project-merge') |
| 2444 | self.assertEqual(self.history[2].result, 'SUCCESS') |
| 2445 | self.assertEqual(self.history[3].result, 'SUCCESS') |
| 2446 | self.assertEqual(self.history[4].result, 'SUCCESS') |
| 2447 | self.assertEqual(len(self.history), 5) |
| 2448 | |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2449 | def test_live_reconfiguration_failed_job(self): |
| 2450 | # Test that a change with a removed failing job does not |
| 2451 | # disrupt reconfiguration. If a change has a failed job and |
| 2452 | # that job is removed during a reconfiguration, we observed a |
| 2453 | # bug where the code to re-set build statuses would run on |
| 2454 | # that build and raise an exception because the job no longer |
| 2455 | # existed. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2456 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2457 | |
| 2458 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2459 | |
| 2460 | # This change will fail and later be removed by the reconfiguration. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2461 | self.executor_server.failJob('project-test1', A) |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2462 | |
| 2463 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2464 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2465 | self.executor_server.release('.*-merge') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2466 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2467 | self.executor_server.release('project-test1') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2468 | self.waitUntilSettled() |
| 2469 | |
| 2470 | self.assertEqual(A.data['status'], 'NEW') |
| 2471 | self.assertEqual(A.reported, 0) |
| 2472 | |
| 2473 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2474 | 'SUCCESS') |
| 2475 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2476 | 'FAILURE') |
| 2477 | self.assertEqual(len(self.history), 2) |
| 2478 | |
| 2479 | # Remove the test1 job. |
Clint Byrum | 841a58c | 2017-05-01 14:17:21 -0700 | [diff] [blame] | 2480 | self.commitConfigUpdate('common-config', |
| 2481 | 'layouts/live-reconfiguration-failed-job.yaml') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2482 | self.sched.reconfigure(self.config) |
| 2483 | self.waitUntilSettled() |
| 2484 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2485 | self.executor_server.hold_jobs_in_build = False |
| 2486 | self.executor_server.release() |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2487 | self.waitUntilSettled() |
| 2488 | |
| 2489 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2490 | 'SUCCESS') |
| 2491 | self.assertEqual(self.getJobFromHistory('project-testfile').result, |
| 2492 | 'SUCCESS') |
| 2493 | self.assertEqual(len(self.history), 4) |
| 2494 | |
| 2495 | self.assertEqual(A.data['status'], 'NEW') |
| 2496 | self.assertEqual(A.reported, 1) |
| 2497 | self.assertIn('Build succeeded', A.messages[0]) |
| 2498 | # Ensure the removed job was not included in the report. |
| 2499 | self.assertNotIn('project-test1', A.messages[0]) |
| 2500 | |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2501 | def test_live_reconfiguration_shared_queue(self): |
| 2502 | # Test that a change with a failing job which was removed from |
| 2503 | # this project but otherwise still exists in the system does |
| 2504 | # not disrupt reconfiguration. |
| 2505 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2506 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2507 | |
| 2508 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2509 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2510 | self.executor_server.failJob('project1-project2-integration', A) |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2511 | |
| 2512 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2513 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2514 | self.executor_server.release('.*-merge') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2515 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2516 | self.executor_server.release('project1-project2-integration') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2517 | self.waitUntilSettled() |
| 2518 | |
| 2519 | self.assertEqual(A.data['status'], 'NEW') |
| 2520 | self.assertEqual(A.reported, 0) |
| 2521 | |
Clint Byrum | 69663d4 | 2017-05-01 14:51:04 -0700 | [diff] [blame] | 2522 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2523 | 'SUCCESS') |
| 2524 | self.assertEqual(self.getJobFromHistory( |
| 2525 | 'project1-project2-integration').result, 'FAILURE') |
| 2526 | self.assertEqual(len(self.history), 2) |
| 2527 | |
| 2528 | # Remove the integration job. |
Clint Byrum | 69663d4 | 2017-05-01 14:51:04 -0700 | [diff] [blame] | 2529 | self.commitConfigUpdate( |
| 2530 | 'common-config', |
| 2531 | 'layouts/live-reconfiguration-shared-queue.yaml') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2532 | self.sched.reconfigure(self.config) |
| 2533 | self.waitUntilSettled() |
| 2534 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2535 | self.executor_server.hold_jobs_in_build = False |
| 2536 | self.executor_server.release() |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2537 | self.waitUntilSettled() |
| 2538 | |
Clint Byrum | 69663d4 | 2017-05-01 14:51:04 -0700 | [diff] [blame] | 2539 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2540 | 'SUCCESS') |
Clint Byrum | 69663d4 | 2017-05-01 14:51:04 -0700 | [diff] [blame] | 2541 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2542 | 'SUCCESS') |
Clint Byrum | 69663d4 | 2017-05-01 14:51:04 -0700 | [diff] [blame] | 2543 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2544 | 'SUCCESS') |
| 2545 | self.assertEqual(self.getJobFromHistory( |
| 2546 | 'project1-project2-integration').result, 'FAILURE') |
| 2547 | self.assertEqual(len(self.history), 4) |
| 2548 | |
| 2549 | self.assertEqual(A.data['status'], 'NEW') |
| 2550 | self.assertEqual(A.reported, 1) |
| 2551 | self.assertIn('Build succeeded', A.messages[0]) |
| 2552 | # Ensure the removed job was not included in the report. |
| 2553 | self.assertNotIn('project1-project2-integration', A.messages[0]) |
| 2554 | |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2555 | def test_double_live_reconfiguration_shared_queue(self): |
| 2556 | # This was a real-world regression. A change is added to |
| 2557 | # gate; a reconfigure happens, a second change which depends |
| 2558 | # on the first is added, and a second reconfiguration happens. |
| 2559 | # Ensure that both changes merge. |
| 2560 | |
| 2561 | # A failure may indicate incorrect caching or cleaning up of |
| 2562 | # references during a reconfiguration. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2563 | self.executor_server.hold_jobs_in_build = True |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2564 | |
| 2565 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2566 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 2567 | B.setDependsOn(A, 1) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2568 | A.addApproval('code-review', 2) |
| 2569 | B.addApproval('code-review', 2) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2570 | |
| 2571 | # Add the parent change. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2572 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2573 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2574 | self.executor_server.release('.*-merge') |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2575 | self.waitUntilSettled() |
| 2576 | |
| 2577 | # Reconfigure (with only one change in the pipeline). |
| 2578 | self.sched.reconfigure(self.config) |
| 2579 | self.waitUntilSettled() |
| 2580 | |
| 2581 | # Add the child change. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2582 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2583 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2584 | self.executor_server.release('.*-merge') |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2585 | self.waitUntilSettled() |
| 2586 | |
| 2587 | # Reconfigure (with both in the pipeline). |
| 2588 | self.sched.reconfigure(self.config) |
| 2589 | self.waitUntilSettled() |
| 2590 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2591 | self.executor_server.hold_jobs_in_build = False |
| 2592 | self.executor_server.release() |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2593 | self.waitUntilSettled() |
| 2594 | |
| 2595 | self.assertEqual(len(self.history), 8) |
| 2596 | |
| 2597 | self.assertEqual(A.data['status'], 'MERGED') |
| 2598 | self.assertEqual(A.reported, 2) |
| 2599 | self.assertEqual(B.data['status'], 'MERGED') |
| 2600 | self.assertEqual(B.reported, 2) |
| 2601 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2602 | def test_live_reconfiguration_del_project(self): |
| 2603 | # Test project deletion from layout |
| 2604 | # while changes are enqueued |
| 2605 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2606 | self.executor_server.hold_jobs_in_build = True |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2607 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2608 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 2609 | C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C') |
| 2610 | |
| 2611 | # A Depends-On: B |
| 2612 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 2613 | A.subject, B.data['id']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2614 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2615 | |
| 2616 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2617 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 2618 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2619 | self.executor_server.release('.*-merge') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2620 | self.waitUntilSettled() |
| 2621 | self.assertEqual(len(self.builds), 5) |
| 2622 | |
| 2623 | # This layout defines only org/project, not org/project1 |
James E. Blair | 31cb3e8 | 2017-04-20 13:08:56 -0700 | [diff] [blame] | 2624 | self.commitConfigUpdate( |
| 2625 | 'common-config', |
| 2626 | 'layouts/live-reconfiguration-del-project.yaml') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2627 | self.sched.reconfigure(self.config) |
| 2628 | self.waitUntilSettled() |
| 2629 | |
| 2630 | # Builds for C aborted, builds for A succeed, |
| 2631 | # and have change B applied ahead |
Clint Byrum | 0149ada | 2017-04-04 12:22:01 -0700 | [diff] [blame] | 2632 | job_c = self.getJobFromHistory('project-test1') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2633 | self.assertEqual(job_c.changes, '3,1') |
| 2634 | self.assertEqual(job_c.result, 'ABORTED') |
| 2635 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2636 | self.executor_server.hold_jobs_in_build = False |
| 2637 | self.executor_server.release() |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2638 | self.waitUntilSettled() |
| 2639 | |
Clint Byrum | 0149ada | 2017-04-04 12:22:01 -0700 | [diff] [blame] | 2640 | self.assertEqual( |
| 2641 | self.getJobFromHistory('project-test1', 'org/project').changes, |
| 2642 | '2,1 1,1') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2643 | |
| 2644 | self.assertEqual(A.data['status'], 'NEW') |
| 2645 | self.assertEqual(B.data['status'], 'NEW') |
| 2646 | self.assertEqual(C.data['status'], 'NEW') |
| 2647 | self.assertEqual(A.reported, 1) |
| 2648 | self.assertEqual(B.reported, 0) |
| 2649 | self.assertEqual(C.reported, 0) |
| 2650 | |
Clint Byrum | 0149ada | 2017-04-04 12:22:01 -0700 | [diff] [blame] | 2651 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 2652 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2653 | self.assertIn('Build succeeded', A.messages[0]) |
| 2654 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2655 | @skip("Disabled for early v3 development") |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2656 | def test_delayed_repo_init(self): |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2657 | self.updateConfigLayout( |
| 2658 | 'tests/fixtures/layout-delayed-repo-init.yaml') |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2659 | self.sched.reconfigure(self.config) |
| 2660 | |
| 2661 | self.init_repo("org/new-project") |
| 2662 | A = self.fake_gerrit.addFakeChange('org/new-project', 'master', 'A') |
| 2663 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2664 | A.addApproval('code-review', 2) |
| 2665 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2666 | self.waitUntilSettled() |
| 2667 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2668 | 'SUCCESS') |
| 2669 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2670 | 'SUCCESS') |
| 2671 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2672 | 'SUCCESS') |
| 2673 | self.assertEqual(A.data['status'], 'MERGED') |
| 2674 | self.assertEqual(A.reported, 2) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2675 | |
James E. Blair | 9ea7007 | 2017-04-19 16:05:30 -0700 | [diff] [blame] | 2676 | @simple_layout('layouts/repo-deleted.yaml') |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2677 | def test_repo_deleted(self): |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2678 | self.init_repo("org/delete-project") |
| 2679 | A = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'A') |
| 2680 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2681 | A.addApproval('code-review', 2) |
| 2682 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2683 | self.waitUntilSettled() |
| 2684 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2685 | 'SUCCESS') |
| 2686 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2687 | 'SUCCESS') |
| 2688 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2689 | 'SUCCESS') |
| 2690 | self.assertEqual(A.data['status'], 'MERGED') |
| 2691 | self.assertEqual(A.reported, 2) |
| 2692 | |
| 2693 | # Delete org/new-project zuul repo. Should be recloned. |
James E. Blair | 8c1be53 | 2017-02-07 14:04:12 -0800 | [diff] [blame] | 2694 | p = 'org/delete-project' |
Monty Taylor | d642d85 | 2017-02-23 14:05:42 -0500 | [diff] [blame] | 2695 | if os.path.exists(os.path.join(self.merger_src_root, p)): |
| 2696 | shutil.rmtree(os.path.join(self.merger_src_root, p)) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2697 | if os.path.exists(os.path.join(self.executor_src_root, p)): |
| 2698 | shutil.rmtree(os.path.join(self.executor_src_root, p)) |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2699 | |
| 2700 | B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B') |
| 2701 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2702 | B.addApproval('code-review', 2) |
| 2703 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2704 | self.waitUntilSettled() |
| 2705 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2706 | 'SUCCESS') |
| 2707 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2708 | 'SUCCESS') |
| 2709 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2710 | 'SUCCESS') |
| 2711 | self.assertEqual(B.data['status'], 'MERGED') |
| 2712 | self.assertEqual(B.reported, 2) |
| 2713 | |
James E. Blair | e68d43f | 2017-04-19 14:03:30 -0700 | [diff] [blame] | 2714 | @simple_layout('layouts/tags.yaml') |
James E. Blair | 456f2fb | 2016-02-09 09:29:33 -0800 | [diff] [blame] | 2715 | def test_tags(self): |
| 2716 | "Test job tags" |
James E. Blair | 456f2fb | 2016-02-09 09:29:33 -0800 | [diff] [blame] | 2717 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2718 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 2719 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2720 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 2721 | self.waitUntilSettled() |
| 2722 | |
James E. Blair | e68d43f | 2017-04-19 14:03:30 -0700 | [diff] [blame] | 2723 | self.assertEqual(len(self.history), 2) |
Cullen Taylor | 3aa6d47 | 2017-03-01 15:22:09 -0600 | [diff] [blame] | 2724 | |
| 2725 | results = {self.getJobFromHistory('merge', |
| 2726 | project='org/project1').uuid: 'extratag merge', |
| 2727 | self.getJobFromHistory('merge', |
| 2728 | project='org/project2').uuid: 'merge'} |
James E. Blair | 456f2fb | 2016-02-09 09:29:33 -0800 | [diff] [blame] | 2729 | |
| 2730 | for build in self.history: |
Cullen Taylor | 3aa6d47 | 2017-03-01 15:22:09 -0600 | [diff] [blame] | 2731 | self.assertEqual(results.get(build.uuid, ''), |
| 2732 | build.parameters['vars']['zuul'].get('tags')) |
James E. Blair | 456f2fb | 2016-02-09 09:29:33 -0800 | [diff] [blame] | 2733 | |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2734 | def test_timer(self): |
| 2735 | "Test that a periodic job is triggered" |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2736 | # This test can not use simple_layout because it must start |
| 2737 | # with a configuration which does not include a |
| 2738 | # timer-triggered job so that we have an opportunity to set |
| 2739 | # the hold flag before the first job. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2740 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2741 | self.commitConfigUpdate('common-config', 'layouts/timer.yaml') |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2742 | self.sched.reconfigure(self.config) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2743 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2744 | # The pipeline triggers every second, so we should have seen |
| 2745 | # several by now. |
| 2746 | time.sleep(5) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2747 | self.waitUntilSettled() |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2748 | |
| 2749 | self.assertEqual(len(self.builds), 2) |
| 2750 | |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2751 | port = self.webapp.server.socket.getsockname()[1] |
| 2752 | |
Clint Byrum | 5e729e9 | 2017-02-08 06:34:57 -0800 | [diff] [blame] | 2753 | req = urllib.request.Request( |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2754 | "http://localhost:%s/tenant-one/status" % port) |
Morgan Fainberg | 293f7f8 | 2016-05-30 14:01:22 -0700 | [diff] [blame] | 2755 | f = urllib.request.urlopen(req) |
Clint Byrum | f322fe2 | 2017-05-10 20:53:12 -0700 | [diff] [blame] | 2756 | data = f.read().decode('utf8') |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2757 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2758 | self.executor_server.hold_jobs_in_build = False |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2759 | # Stop queuing timer triggered jobs so that the assertions |
| 2760 | # below don't race against more jobs being queued. |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2761 | self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2762 | self.sched.reconfigure(self.config) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2763 | self.executor_server.release() |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2764 | self.waitUntilSettled() |
| 2765 | |
| 2766 | self.assertEqual(self.getJobFromHistory( |
| 2767 | 'project-bitrot-stable-old').result, 'SUCCESS') |
| 2768 | self.assertEqual(self.getJobFromHistory( |
| 2769 | 'project-bitrot-stable-older').result, 'SUCCESS') |
| 2770 | |
| 2771 | data = json.loads(data) |
| 2772 | status_jobs = set() |
| 2773 | for p in data['pipelines']: |
| 2774 | for q in p['change_queues']: |
| 2775 | for head in q['heads']: |
| 2776 | for change in head: |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2777 | for job in change['jobs']: |
| 2778 | status_jobs.add(job['name']) |
| 2779 | self.assertIn('project-bitrot-stable-old', status_jobs) |
| 2780 | self.assertIn('project-bitrot-stable-older', status_jobs) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2781 | |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2782 | def test_idle(self): |
| 2783 | "Test that frequent periodic jobs work" |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2784 | # This test can not use simple_layout because it must start |
| 2785 | # with a configuration which does not include a |
| 2786 | # timer-triggered job so that we have an opportunity to set |
| 2787 | # the hold flag before the first job. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2788 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2789 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2790 | for x in range(1, 3): |
| 2791 | # Test that timer triggers periodic jobs even across |
| 2792 | # layout config reloads. |
| 2793 | # Start timer trigger |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2794 | self.commitConfigUpdate('common-config', |
| 2795 | 'layouts/idle.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2796 | self.sched.reconfigure(self.config) |
James E. Blair | 995fc0f | 2016-02-04 16:48:31 -0800 | [diff] [blame] | 2797 | self.waitUntilSettled() |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2798 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2799 | # The pipeline triggers every second, so we should have seen |
| 2800 | # several by now. |
| 2801 | time.sleep(5) |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2802 | |
| 2803 | # Stop queuing timer triggered jobs so that the assertions |
| 2804 | # below don't race against more jobs being queued. |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2805 | self.commitConfigUpdate('common-config', |
| 2806 | 'layouts/no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2807 | self.sched.reconfigure(self.config) |
James E. Blair | 995fc0f | 2016-02-04 16:48:31 -0800 | [diff] [blame] | 2808 | self.waitUntilSettled() |
Clint Byrum | 58264dc | 2017-02-07 21:21:22 -0800 | [diff] [blame] | 2809 | self.assertEqual(len(self.builds), 2, |
| 2810 | 'Timer builds iteration #%d' % x) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2811 | self.executor_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2812 | self.waitUntilSettled() |
| 2813 | self.assertEqual(len(self.builds), 0) |
| 2814 | self.assertEqual(len(self.history), x * 2) |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2815 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 2816 | @simple_layout('layouts/smtp.yaml') |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2817 | def test_check_smtp_pool(self): |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2818 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2819 | self.waitUntilSettled() |
| 2820 | |
| 2821 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2822 | self.waitUntilSettled() |
| 2823 | |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2824 | self.assertEqual(len(self.smtp_messages), 2) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2825 | |
| 2826 | # A.messages only holds what FakeGerrit places in it. Thus we |
| 2827 | # work on the knowledge of what the first message should be as |
| 2828 | # it is only configured to go to SMTP. |
| 2829 | |
| 2830 | self.assertEqual('zuul@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2831 | self.smtp_messages[0]['from_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2832 | self.assertEqual(['you@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2833 | self.smtp_messages[0]['to_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2834 | self.assertEqual('Starting check jobs.', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2835 | self.smtp_messages[0]['body']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2836 | |
| 2837 | self.assertEqual('zuul_from@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2838 | self.smtp_messages[1]['from_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2839 | self.assertEqual(['alternative_me@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2840 | self.smtp_messages[1]['to_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2841 | self.assertEqual(A.messages[0], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2842 | self.smtp_messages[1]['body']) |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2843 | |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2844 | def test_timer_smtp(self): |
| 2845 | "Test that a periodic job is triggered" |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2846 | # This test can not use simple_layout because it must start |
| 2847 | # with a configuration which does not include a |
| 2848 | # timer-triggered job so that we have an opportunity to set |
| 2849 | # the hold flag before the first job. |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2850 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2851 | self.commitConfigUpdate('common-config', 'layouts/timer-smtp.yaml') |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2852 | self.sched.reconfigure(self.config) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2853 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2854 | # The pipeline triggers every second, so we should have seen |
| 2855 | # several by now. |
| 2856 | time.sleep(5) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2857 | self.waitUntilSettled() |
| 2858 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2859 | self.assertEqual(len(self.builds), 2) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2860 | self.executor_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2861 | self.waitUntilSettled() |
| 2862 | self.assertEqual(len(self.history), 2) |
| 2863 | |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2864 | self.assertEqual(self.getJobFromHistory( |
| 2865 | 'project-bitrot-stable-old').result, 'SUCCESS') |
| 2866 | self.assertEqual(self.getJobFromHistory( |
| 2867 | 'project-bitrot-stable-older').result, 'SUCCESS') |
| 2868 | |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2869 | self.assertEqual(len(self.smtp_messages), 1) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2870 | |
| 2871 | # A.messages only holds what FakeGerrit places in it. Thus we |
| 2872 | # work on the knowledge of what the first message should be as |
| 2873 | # it is only configured to go to SMTP. |
| 2874 | |
| 2875 | self.assertEqual('zuul_from@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2876 | self.smtp_messages[0]['from_email']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2877 | self.assertEqual(['alternative_me@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2878 | self.smtp_messages[0]['to_email']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2879 | self.assertIn('Subject: Periodic check for org/project succeeded', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2880 | self.smtp_messages[0]['headers']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 2881 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2882 | # Stop queuing timer triggered jobs and let any that may have |
| 2883 | # queued through so that end of test assertions pass. |
James E. Blair | dfdfcfc | 2017-04-20 10:19:20 -0700 | [diff] [blame] | 2884 | self.commitConfigUpdate('common-config', 'layouts/no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2885 | self.sched.reconfigure(self.config) |
James E. Blair | f805897 | 2014-08-15 16:09:16 -0700 | [diff] [blame] | 2886 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 2887 | self.executor_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2888 | self.waitUntilSettled() |
| 2889 | |
Joshua Hesketh | 25695cb | 2017-03-06 12:50:04 +1100 | [diff] [blame] | 2890 | @skip("Disabled for early v3 development") |
Evgeny Antyshev | da90a50 | 2017-02-08 08:42:59 +0000 | [diff] [blame] | 2891 | def test_timer_sshkey(self): |
| 2892 | "Test that a periodic job can setup SSH key authentication" |
| 2893 | self.worker.hold_jobs_in_build = True |
| 2894 | self.config.set('zuul', 'layout_config', |
| 2895 | 'tests/fixtures/layout-timer.yaml') |
| 2896 | self.sched.reconfigure(self.config) |
| 2897 | self.registerJobs() |
| 2898 | |
| 2899 | # The pipeline triggers every second, so we should have seen |
| 2900 | # several by now. |
| 2901 | time.sleep(5) |
| 2902 | self.waitUntilSettled() |
| 2903 | |
| 2904 | self.assertEqual(len(self.builds), 2) |
| 2905 | |
| 2906 | ssh_wrapper = os.path.join(self.git_root, ".ssh_wrapper_gerrit") |
| 2907 | self.assertTrue(os.path.isfile(ssh_wrapper)) |
| 2908 | with open(ssh_wrapper) as f: |
| 2909 | ssh_wrapper_content = f.read() |
| 2910 | self.assertIn("fake_id_rsa", ssh_wrapper_content) |
| 2911 | # In the unit tests Merger runs in the same process, |
| 2912 | # so we see its' environment variables |
| 2913 | self.assertEqual(os.environ['GIT_SSH'], ssh_wrapper) |
| 2914 | |
| 2915 | self.worker.release('.*') |
| 2916 | self.waitUntilSettled() |
| 2917 | self.assertEqual(len(self.history), 2) |
| 2918 | |
| 2919 | self.assertEqual(self.getJobFromHistory( |
| 2920 | 'project-bitrot-stable-old').result, 'SUCCESS') |
| 2921 | self.assertEqual(self.getJobFromHistory( |
| 2922 | 'project-bitrot-stable-older').result, 'SUCCESS') |
| 2923 | |
| 2924 | # Stop queuing timer triggered jobs and let any that may have |
| 2925 | # queued through so that end of test assertions pass. |
| 2926 | self.config.set('zuul', 'layout_config', |
| 2927 | 'tests/fixtures/layout-no-timer.yaml') |
| 2928 | self.sched.reconfigure(self.config) |
| 2929 | self.registerJobs() |
| 2930 | self.waitUntilSettled() |
| 2931 | self.worker.release('.*') |
| 2932 | self.waitUntilSettled() |
| 2933 | |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 2934 | def test_client_enqueue_change(self): |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2935 | "Test that the RPC client can enqueue a change" |
| 2936 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2937 | A.addApproval('code-review', 2) |
| 2938 | A.addApproval('approved', 1) |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2939 | |
| 2940 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 2941 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 2942 | self.addCleanup(client.shutdown) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 2943 | r = client.enqueue(tenant='tenant-one', |
| 2944 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2945 | project='org/project', |
| 2946 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 2947 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2948 | self.waitUntilSettled() |
| 2949 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2950 | 'SUCCESS') |
| 2951 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2952 | 'SUCCESS') |
| 2953 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2954 | 'SUCCESS') |
| 2955 | self.assertEqual(A.data['status'], 'MERGED') |
| 2956 | self.assertEqual(A.reported, 2) |
| 2957 | self.assertEqual(r, True) |
| 2958 | |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 2959 | def test_client_enqueue_ref(self): |
| 2960 | "Test that the RPC client can enqueue a ref" |
| 2961 | |
| 2962 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 2963 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 2964 | self.addCleanup(client.shutdown) |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 2965 | r = client.enqueue_ref( |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 2966 | tenant='tenant-one', |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 2967 | pipeline='post', |
| 2968 | project='org/project', |
| 2969 | trigger='gerrit', |
| 2970 | ref='master', |
| 2971 | oldrev='90f173846e3af9154517b88543ffbd1691f31366', |
| 2972 | newrev='d479a0bfcb34da57a31adb2a595c0cf687812543') |
| 2973 | self.waitUntilSettled() |
| 2974 | job_names = [x.name for x in self.history] |
| 2975 | self.assertEqual(len(self.history), 1) |
| 2976 | self.assertIn('project-post', job_names) |
| 2977 | self.assertEqual(r, True) |
| 2978 | |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2979 | def test_client_enqueue_negative(self): |
| 2980 | "Test that the RPC client returns errors" |
| 2981 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 2982 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 2983 | self.addCleanup(client.shutdown) |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2984 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 2985 | "Invalid tenant"): |
| 2986 | r = client.enqueue(tenant='tenant-foo', |
| 2987 | pipeline='gate', |
| 2988 | project='org/project', |
| 2989 | trigger='gerrit', |
| 2990 | change='1,1') |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 2991 | self.assertEqual(r, False) |
| 2992 | |
| 2993 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2994 | "Invalid project"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 2995 | r = client.enqueue(tenant='tenant-one', |
| 2996 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 2997 | project='project-does-not-exist', |
| 2998 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 2999 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3000 | self.assertEqual(r, False) |
| 3001 | |
| 3002 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3003 | "Invalid pipeline"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3004 | r = client.enqueue(tenant='tenant-one', |
| 3005 | pipeline='pipeline-does-not-exist', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3006 | project='org/project', |
| 3007 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3008 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3009 | self.assertEqual(r, False) |
| 3010 | |
| 3011 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3012 | "Invalid trigger"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3013 | r = client.enqueue(tenant='tenant-one', |
| 3014 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3015 | project='org/project', |
| 3016 | trigger='trigger-does-not-exist', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3017 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3018 | self.assertEqual(r, False) |
| 3019 | |
| 3020 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3021 | "Invalid change"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3022 | r = client.enqueue(tenant='tenant-one', |
| 3023 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3024 | project='org/project', |
| 3025 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3026 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3027 | self.assertEqual(r, False) |
| 3028 | |
| 3029 | self.waitUntilSettled() |
| 3030 | self.assertEqual(len(self.history), 0) |
| 3031 | self.assertEqual(len(self.builds), 0) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3032 | |
| 3033 | def test_client_promote(self): |
| 3034 | "Test that the RPC client can promote a change" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3035 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3036 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3037 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3038 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3039 | A.addApproval('code-review', 2) |
| 3040 | B.addApproval('code-review', 2) |
| 3041 | C.addApproval('code-review', 2) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3042 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3043 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3044 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3045 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3046 | |
| 3047 | self.waitUntilSettled() |
| 3048 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3049 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 3050 | items = tenant.layout.pipelines['gate'].getAllItems() |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3051 | enqueue_times = {} |
| 3052 | for item in items: |
| 3053 | enqueue_times[str(item.change)] = item.enqueue_time |
| 3054 | |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3055 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3056 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 3057 | self.addCleanup(client.shutdown) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3058 | r = client.promote(tenant='tenant-one', |
| 3059 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3060 | change_ids=['2,1', '3,1']) |
| 3061 | |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3062 | # ensure that enqueue times are durable |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3063 | items = tenant.layout.pipelines['gate'].getAllItems() |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3064 | for item in items: |
| 3065 | self.assertEqual( |
| 3066 | enqueue_times[str(item.change)], item.enqueue_time) |
| 3067 | |
James E. Blair | 78acec9 | 2014-02-06 07:11:32 -0800 | [diff] [blame] | 3068 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3069 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3070 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3071 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3072 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3073 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3074 | self.waitUntilSettled() |
| 3075 | |
| 3076 | self.assertEqual(len(self.builds), 6) |
| 3077 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3078 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3079 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3080 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3081 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 3082 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 3083 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3084 | self.assertTrue(self.builds[0].hasChanges(B)) |
| 3085 | self.assertFalse(self.builds[0].hasChanges(A)) |
| 3086 | self.assertFalse(self.builds[0].hasChanges(C)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3087 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3088 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 3089 | self.assertTrue(self.builds[2].hasChanges(C)) |
| 3090 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3091 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3092 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 3093 | self.assertTrue(self.builds[4].hasChanges(C)) |
| 3094 | self.assertTrue(self.builds[4].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3095 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3096 | self.executor_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3097 | self.waitUntilSettled() |
| 3098 | |
| 3099 | self.assertEqual(A.data['status'], 'MERGED') |
| 3100 | self.assertEqual(A.reported, 2) |
| 3101 | self.assertEqual(B.data['status'], 'MERGED') |
| 3102 | self.assertEqual(B.reported, 2) |
| 3103 | self.assertEqual(C.data['status'], 'MERGED') |
| 3104 | self.assertEqual(C.reported, 2) |
| 3105 | |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3106 | self.assertEqual(r, True) |
| 3107 | |
| 3108 | def test_client_promote_dependent(self): |
| 3109 | "Test that the RPC client can promote a dependent change" |
| 3110 | # C (depends on B) -> B -> A ; then promote C to get: |
| 3111 | # A -> C (depends on B) -> B |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3112 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3113 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3114 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3115 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3116 | |
| 3117 | C.setDependsOn(B, 1) |
| 3118 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3119 | A.addApproval('code-review', 2) |
| 3120 | B.addApproval('code-review', 2) |
| 3121 | C.addApproval('code-review', 2) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3122 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3123 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3124 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3125 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3126 | |
| 3127 | self.waitUntilSettled() |
| 3128 | |
| 3129 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3130 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 3131 | self.addCleanup(client.shutdown) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3132 | r = client.promote(tenant='tenant-one', |
| 3133 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3134 | change_ids=['3,1']) |
| 3135 | |
James E. Blair | 78acec9 | 2014-02-06 07:11:32 -0800 | [diff] [blame] | 3136 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3137 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3138 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3139 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3140 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3141 | self.executor_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3142 | self.waitUntilSettled() |
| 3143 | |
| 3144 | self.assertEqual(len(self.builds), 6) |
| 3145 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3146 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3147 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3148 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3149 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 3150 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 3151 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3152 | self.assertTrue(self.builds[0].hasChanges(B)) |
| 3153 | self.assertFalse(self.builds[0].hasChanges(A)) |
| 3154 | self.assertFalse(self.builds[0].hasChanges(C)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3155 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3156 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 3157 | self.assertTrue(self.builds[2].hasChanges(C)) |
| 3158 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3159 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3160 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 3161 | self.assertTrue(self.builds[4].hasChanges(C)) |
| 3162 | self.assertTrue(self.builds[4].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3163 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3164 | self.executor_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3165 | self.waitUntilSettled() |
| 3166 | |
| 3167 | self.assertEqual(A.data['status'], 'MERGED') |
| 3168 | self.assertEqual(A.reported, 2) |
| 3169 | self.assertEqual(B.data['status'], 'MERGED') |
| 3170 | self.assertEqual(B.reported, 2) |
| 3171 | self.assertEqual(C.data['status'], 'MERGED') |
| 3172 | self.assertEqual(C.reported, 2) |
| 3173 | |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3174 | self.assertEqual(r, True) |
| 3175 | |
| 3176 | def test_client_promote_negative(self): |
| 3177 | "Test that the RPC client returns errors for promotion" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3178 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3179 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3180 | A.addApproval('code-review', 2) |
| 3181 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3182 | self.waitUntilSettled() |
| 3183 | |
| 3184 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3185 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 3186 | self.addCleanup(client.shutdown) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3187 | |
| 3188 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3189 | r = client.promote(tenant='tenant-one', |
| 3190 | pipeline='nonexistent', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3191 | change_ids=['2,1', '3,1']) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3192 | self.assertEqual(r, False) |
| 3193 | |
| 3194 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3195 | r = client.promote(tenant='tenant-one', |
| 3196 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3197 | change_ids=['4,1']) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3198 | self.assertEqual(r, False) |
| 3199 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3200 | self.executor_server.hold_jobs_in_build = False |
| 3201 | self.executor_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3202 | self.waitUntilSettled() |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3203 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 3204 | @simple_layout('layouts/rate-limit.yaml') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3205 | def test_queue_rate_limiting(self): |
| 3206 | "Test that DependentPipelines are rate limited with dep across window" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3207 | self.executor_server.hold_jobs_in_build = True |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3208 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3209 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3210 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3211 | |
| 3212 | C.setDependsOn(B, 1) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3213 | self.executor_server.failJob('project-test1', A) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3214 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3215 | A.addApproval('code-review', 2) |
| 3216 | B.addApproval('code-review', 2) |
| 3217 | C.addApproval('code-review', 2) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3218 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3219 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3220 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3221 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3222 | self.waitUntilSettled() |
| 3223 | |
| 3224 | # Only A and B will have their merge jobs queued because |
| 3225 | # window is 2. |
| 3226 | self.assertEqual(len(self.builds), 2) |
| 3227 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3228 | self.assertEqual(self.builds[1].name, 'project-merge') |
| 3229 | |
James E. Blair | 732ee86 | 2017-04-21 07:49:26 -0700 | [diff] [blame] | 3230 | # Release the merge jobs one at a time. |
| 3231 | self.builds[0].release() |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3232 | self.waitUntilSettled() |
James E. Blair | 732ee86 | 2017-04-21 07:49:26 -0700 | [diff] [blame] | 3233 | self.builds[0].release() |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3234 | self.waitUntilSettled() |
| 3235 | |
| 3236 | # Only A and B will have their test jobs queued because |
| 3237 | # window is 2. |
| 3238 | self.assertEqual(len(self.builds), 4) |
| 3239 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3240 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3241 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3242 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3243 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3244 | self.executor_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3245 | self.waitUntilSettled() |
| 3246 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 3247 | tenant = self.sched.abide.tenants.get('tenant-one') |
Clint Byrum | b01f1ca | 2017-04-02 10:19:52 -0700 | [diff] [blame] | 3248 | queue = tenant.layout.pipelines['gate'].queues[0] |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3249 | # A failed so window is reduced by 1 to 1. |
| 3250 | self.assertEqual(queue.window, 1) |
| 3251 | self.assertEqual(queue.window_floor, 1) |
| 3252 | self.assertEqual(A.data['status'], 'NEW') |
| 3253 | |
| 3254 | # Gate is reset and only B's merge job is queued because |
| 3255 | # window shrunk to 1. |
| 3256 | self.assertEqual(len(self.builds), 1) |
| 3257 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3258 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3259 | self.executor_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3260 | self.waitUntilSettled() |
| 3261 | |
| 3262 | # Only B's test jobs are queued because window is still 1. |
| 3263 | self.assertEqual(len(self.builds), 2) |
| 3264 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3265 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3266 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3267 | self.executor_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3268 | self.waitUntilSettled() |
| 3269 | |
| 3270 | # B was successfully merged so window is increased to 2. |
| 3271 | self.assertEqual(queue.window, 2) |
| 3272 | self.assertEqual(queue.window_floor, 1) |
| 3273 | self.assertEqual(B.data['status'], 'MERGED') |
| 3274 | |
| 3275 | # Only C is left and its merge job is queued. |
| 3276 | self.assertEqual(len(self.builds), 1) |
| 3277 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3278 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3279 | self.executor_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3280 | self.waitUntilSettled() |
| 3281 | |
| 3282 | # After successful merge job the test jobs for C are queued. |
| 3283 | self.assertEqual(len(self.builds), 2) |
| 3284 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3285 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3286 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3287 | self.executor_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3288 | self.waitUntilSettled() |
| 3289 | |
| 3290 | # C successfully merged so window is bumped to 3. |
| 3291 | self.assertEqual(queue.window, 3) |
| 3292 | self.assertEqual(queue.window_floor, 1) |
| 3293 | self.assertEqual(C.data['status'], 'MERGED') |
| 3294 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 3295 | @simple_layout('layouts/rate-limit.yaml') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3296 | def test_queue_rate_limiting_dependent(self): |
| 3297 | "Test that DependentPipelines are rate limited with dep in window" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3298 | self.executor_server.hold_jobs_in_build = True |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3299 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3300 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3301 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3302 | |
| 3303 | B.setDependsOn(A, 1) |
| 3304 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3305 | self.executor_server.failJob('project-test1', A) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3306 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3307 | A.addApproval('code-review', 2) |
| 3308 | B.addApproval('code-review', 2) |
| 3309 | C.addApproval('code-review', 2) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3310 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3311 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3312 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3313 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3314 | self.waitUntilSettled() |
| 3315 | |
| 3316 | # Only A and B will have their merge jobs queued because |
| 3317 | # window is 2. |
| 3318 | self.assertEqual(len(self.builds), 2) |
| 3319 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3320 | self.assertEqual(self.builds[1].name, 'project-merge') |
| 3321 | |
James E. Blair | f4a5f02 | 2017-04-18 14:01:10 -0700 | [diff] [blame] | 3322 | self.orderedRelease(2) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3323 | |
| 3324 | # Only A and B will have their test jobs queued because |
| 3325 | # window is 2. |
| 3326 | self.assertEqual(len(self.builds), 4) |
| 3327 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3328 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3329 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3330 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3331 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3332 | self.executor_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3333 | self.waitUntilSettled() |
| 3334 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 3335 | tenant = self.sched.abide.tenants.get('tenant-one') |
Clint Byrum | 14ab6ca | 2017-04-03 10:15:10 -0700 | [diff] [blame] | 3336 | queue = tenant.layout.pipelines['gate'].queues[0] |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3337 | # A failed so window is reduced by 1 to 1. |
| 3338 | self.assertEqual(queue.window, 1) |
| 3339 | self.assertEqual(queue.window_floor, 1) |
| 3340 | self.assertEqual(A.data['status'], 'NEW') |
| 3341 | self.assertEqual(B.data['status'], 'NEW') |
| 3342 | |
| 3343 | # Gate is reset and only C's merge job is queued because |
| 3344 | # window shrunk to 1 and A and B were dequeued. |
| 3345 | self.assertEqual(len(self.builds), 1) |
| 3346 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3347 | |
James E. Blair | f4a5f02 | 2017-04-18 14:01:10 -0700 | [diff] [blame] | 3348 | self.orderedRelease(1) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3349 | |
| 3350 | # Only C's test jobs are queued because window is still 1. |
| 3351 | self.assertEqual(len(self.builds), 2) |
| 3352 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3353 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3354 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3355 | self.executor_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3356 | self.waitUntilSettled() |
| 3357 | |
| 3358 | # C was successfully merged so window is increased to 2. |
| 3359 | self.assertEqual(queue.window, 2) |
| 3360 | self.assertEqual(queue.window_floor, 1) |
| 3361 | self.assertEqual(C.data['status'], 'MERGED') |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3362 | |
| 3363 | def test_worker_update_metadata(self): |
| 3364 | "Test if a worker can send back metadata about itself" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3365 | self.executor_server.hold_jobs_in_build = True |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3366 | |
| 3367 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3368 | A.addApproval('code-review', 2) |
| 3369 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3370 | self.waitUntilSettled() |
| 3371 | |
Clint Byrum | d4de79a | 2017-05-27 11:39:13 -0700 | [diff] [blame] | 3372 | self.assertEqual(len(self.executor_client.builds), 1) |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3373 | |
| 3374 | self.log.debug('Current builds:') |
Clint Byrum | d4de79a | 2017-05-27 11:39:13 -0700 | [diff] [blame] | 3375 | self.log.debug(self.executor_client.builds) |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3376 | |
| 3377 | start = time.time() |
| 3378 | while True: |
| 3379 | if time.time() - start > 10: |
| 3380 | raise Exception("Timeout waiting for gearman server to report " |
| 3381 | + "back to the client") |
Clint Byrum | d4de79a | 2017-05-27 11:39:13 -0700 | [diff] [blame] | 3382 | build = list(self.executor_client.builds.values())[0] |
Monty Taylor | eea6bb9 | 2017-06-14 11:56:54 -0500 | [diff] [blame] | 3383 | if build.worker.name == self.executor_server.hostname: |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3384 | break |
| 3385 | else: |
| 3386 | time.sleep(0) |
| 3387 | |
| 3388 | self.log.debug(build) |
Monty Taylor | eea6bb9 | 2017-06-14 11:56:54 -0500 | [diff] [blame] | 3389 | self.assertEqual(self.executor_server.hostname, build.worker.name) |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3390 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3391 | self.executor_server.hold_jobs_in_build = False |
| 3392 | self.executor_server.release() |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3393 | self.waitUntilSettled() |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3394 | |
James E. Blair | cc32419 | 2017-04-19 14:36:08 -0700 | [diff] [blame] | 3395 | @simple_layout('layouts/footer-message.yaml') |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3396 | def test_footer_message(self): |
| 3397 | "Test a pipeline's footer message is correctly added to the report." |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3398 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3399 | A.addApproval('code-review', 2) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3400 | self.executor_server.failJob('project-test1', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3401 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3402 | self.waitUntilSettled() |
| 3403 | |
| 3404 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3405 | B.addApproval('code-review', 2) |
| 3406 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3407 | self.waitUntilSettled() |
| 3408 | |
| 3409 | self.assertEqual(2, len(self.smtp_messages)) |
| 3410 | |
Adam Gandelman | 82258fd | 2017-02-07 16:51:58 -0800 | [diff] [blame] | 3411 | failure_msg = """\ |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3412 | Build failed. For information on how to proceed, see \ |
Adam Gandelman | 82258fd | 2017-02-07 16:51:58 -0800 | [diff] [blame] | 3413 | http://wiki.example.org/Test_Failures""" |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3414 | |
Adam Gandelman | 82258fd | 2017-02-07 16:51:58 -0800 | [diff] [blame] | 3415 | footer_msg = """\ |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3416 | For CI problems and help debugging, contact ci@example.org""" |
| 3417 | |
Adam Gandelman | 82258fd | 2017-02-07 16:51:58 -0800 | [diff] [blame] | 3418 | self.assertTrue(self.smtp_messages[0]['body'].startswith(failure_msg)) |
| 3419 | self.assertTrue(self.smtp_messages[0]['body'].endswith(footer_msg)) |
| 3420 | self.assertFalse(self.smtp_messages[1]['body'].startswith(failure_msg)) |
| 3421 | self.assertTrue(self.smtp_messages[1]['body'].endswith(footer_msg)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3422 | |
Tobias Henkel | 9842bd7 | 2017-05-16 13:40:03 +0200 | [diff] [blame] | 3423 | @simple_layout('layouts/unmanaged-project.yaml') |
| 3424 | def test_unmanaged_project_start_message(self): |
| 3425 | "Test start reporting is not done for unmanaged projects." |
| 3426 | self.init_repo("org/project", tag='init') |
| 3427 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3428 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3429 | self.waitUntilSettled() |
| 3430 | |
| 3431 | self.assertEqual(0, len(A.messages)) |
| 3432 | |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3433 | @simple_layout('layouts/merge-failure.yaml') |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3434 | def test_merge_failure_reporters(self): |
| 3435 | """Check that the config is set up correctly""" |
| 3436 | |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3437 | tenant = self.sched.abide.tenants.get('tenant-one') |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3438 | self.assertEqual( |
Jeremy Stanley | 1c2c3c2 | 2015-06-15 21:23:19 +0000 | [diff] [blame] | 3439 | "Merge Failed.\n\nThis change or one of its cross-repo " |
| 3440 | "dependencies was unable to be automatically merged with the " |
| 3441 | "current state of its repository. Please rebase the change and " |
| 3442 | "upload a new patchset.", |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3443 | tenant.layout.pipelines['check'].merge_failure_message) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3444 | self.assertEqual( |
| 3445 | "The merge failed! For more information...", |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3446 | tenant.layout.pipelines['gate'].merge_failure_message) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3447 | |
| 3448 | self.assertEqual( |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3449 | len(tenant.layout.pipelines['check'].merge_failure_actions), 1) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3450 | self.assertEqual( |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3451 | len(tenant.layout.pipelines['gate'].merge_failure_actions), 2) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3452 | |
| 3453 | self.assertTrue(isinstance( |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3454 | tenant.layout.pipelines['check'].merge_failure_actions[0], |
| 3455 | gerritreporter.GerritReporter)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3456 | |
| 3457 | self.assertTrue( |
| 3458 | ( |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3459 | isinstance(tenant.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3460 | merge_failure_actions[0], |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3461 | zuul.driver.smtp.smtpreporter.SMTPReporter) and |
| 3462 | isinstance(tenant.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3463 | merge_failure_actions[1], |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3464 | gerritreporter.GerritReporter) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3465 | ) or ( |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3466 | isinstance(tenant.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3467 | merge_failure_actions[0], |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3468 | gerritreporter.GerritReporter) and |
| 3469 | isinstance(tenant.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3470 | merge_failure_actions[1], |
Clint Byrum | b9de8be | 2017-05-27 13:49:19 -0700 | [diff] [blame] | 3471 | zuul.driver.smtp.smtpreporter.SMTPReporter) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3472 | ) |
| 3473 | ) |
| 3474 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3475 | @skip("Disabled for early v3 development") |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3476 | def test_merge_failure_reports(self): |
| 3477 | """Check that when a change fails to merge the correct message is sent |
| 3478 | to the correct reporter""" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3479 | self.updateConfigLayout( |
| 3480 | 'tests/fixtures/layout-merge-failure.yaml') |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3481 | self.sched.reconfigure(self.config) |
| 3482 | self.registerJobs() |
| 3483 | |
| 3484 | # Check a test failure isn't reported to SMTP |
| 3485 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3486 | A.addApproval('code-review', 2) |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3487 | self.executor_server.failJob('project-test1', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3488 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3489 | self.waitUntilSettled() |
| 3490 | |
| 3491 | self.assertEqual(3, len(self.history)) # 3 jobs |
| 3492 | self.assertEqual(0, len(self.smtp_messages)) |
| 3493 | |
| 3494 | # Check a merge failure is reported to SMTP |
| 3495 | # B should be merged, but C will conflict with B |
| 3496 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3497 | B.addPatchset(['conflict']) |
| 3498 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3499 | C.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3500 | B.addApproval('code-review', 2) |
| 3501 | C.addApproval('code-review', 2) |
| 3502 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3503 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3504 | self.waitUntilSettled() |
| 3505 | |
| 3506 | self.assertEqual(6, len(self.history)) # A and B jobs |
| 3507 | self.assertEqual(1, len(self.smtp_messages)) |
| 3508 | self.assertEqual('The merge failed! For more information...', |
| 3509 | self.smtp_messages[0]['body']) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3510 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3511 | @skip("Disabled for early v3 development") |
James E. Blair | f760f0e | 2016-02-09 08:44:52 -0800 | [diff] [blame] | 3512 | def test_default_merge_failure_reports(self): |
| 3513 | """Check that the default merge failure reports are correct.""" |
| 3514 | |
| 3515 | # A should report success, B should report merge failure. |
| 3516 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3517 | A.addPatchset(['conflict']) |
| 3518 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3519 | B.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3520 | A.addApproval('code-review', 2) |
| 3521 | B.addApproval('code-review', 2) |
| 3522 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3523 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | f760f0e | 2016-02-09 08:44:52 -0800 | [diff] [blame] | 3524 | self.waitUntilSettled() |
| 3525 | |
| 3526 | self.assertEqual(3, len(self.history)) # A jobs |
| 3527 | self.assertEqual(A.reported, 2) |
| 3528 | self.assertEqual(B.reported, 2) |
| 3529 | self.assertEqual(A.data['status'], 'MERGED') |
| 3530 | self.assertEqual(B.data['status'], 'NEW') |
| 3531 | self.assertIn('Build succeeded', A.messages[1]) |
| 3532 | self.assertIn('Merge Failed', B.messages[1]) |
| 3533 | self.assertIn('automatically merged', B.messages[1]) |
| 3534 | self.assertNotIn('logs.example.com', B.messages[1]) |
| 3535 | self.assertNotIn('SKIPPED', B.messages[1]) |
| 3536 | |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3537 | def test_client_get_running_jobs(self): |
| 3538 | "Test that the RPC client can get a list of running jobs" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3539 | self.executor_server.hold_jobs_in_build = True |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3540 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3541 | A.addApproval('code-review', 2) |
| 3542 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3543 | self.waitUntilSettled() |
| 3544 | |
| 3545 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3546 | self.gearman_server.port) |
Clark Boylan | df4eba2 | 2017-04-24 17:37:58 -0700 | [diff] [blame] | 3547 | self.addCleanup(client.shutdown) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3548 | |
| 3549 | # Wait for gearman server to send the initial workData back to zuul |
| 3550 | start = time.time() |
| 3551 | while True: |
| 3552 | if time.time() - start > 10: |
| 3553 | raise Exception("Timeout waiting for gearman server to report " |
| 3554 | + "back to the client") |
Clint Byrum | 1d0c7d1 | 2017-05-10 19:40:53 -0700 | [diff] [blame] | 3555 | build = list(self.executor_client.builds.values())[0] |
Monty Taylor | eea6bb9 | 2017-06-14 11:56:54 -0500 | [diff] [blame] | 3556 | if build.worker.name == self.executor_server.hostname: |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3557 | break |
| 3558 | else: |
| 3559 | time.sleep(0) |
| 3560 | |
| 3561 | running_items = client.get_running_jobs() |
| 3562 | |
| 3563 | self.assertEqual(1, len(running_items)) |
| 3564 | running_item = running_items[0] |
| 3565 | self.assertEqual([], running_item['failing_reasons']) |
| 3566 | self.assertEqual([], running_item['items_behind']) |
| 3567 | self.assertEqual('https://hostname/1', running_item['url']) |
Monty Taylor | 38b553a | 2017-06-05 13:06:10 -0500 | [diff] [blame] | 3568 | self.assertIsNone(running_item['item_ahead']) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3569 | self.assertEqual('org/project', running_item['project']) |
Monty Taylor | 38b553a | 2017-06-05 13:06:10 -0500 | [diff] [blame] | 3570 | self.assertIsNone(running_item['remaining_time']) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3571 | self.assertEqual(True, running_item['active']) |
| 3572 | self.assertEqual('1,1', running_item['id']) |
| 3573 | |
| 3574 | self.assertEqual(3, len(running_item['jobs'])) |
| 3575 | for job in running_item['jobs']: |
| 3576 | if job['name'] == 'project-merge': |
| 3577 | self.assertEqual('project-merge', job['name']) |
| 3578 | self.assertEqual('gate', job['pipeline']) |
| 3579 | self.assertEqual(False, job['retry']) |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 3580 | self.assertEqual('finger://zl.example.com/%s' % job['uuid'], |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3581 | job['url']) |
Clint Byrum | d4de79a | 2017-05-27 11:39:13 -0700 | [diff] [blame] | 3582 | self.assertEqual(2, len(job['worker'])) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3583 | self.assertEqual(False, job['canceled']) |
| 3584 | self.assertEqual(True, job['voting']) |
Monty Taylor | 38b553a | 2017-06-05 13:06:10 -0500 | [diff] [blame] | 3585 | self.assertIsNone(job['result']) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3586 | self.assertEqual('gate', job['pipeline']) |
| 3587 | break |
| 3588 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3589 | self.executor_server.hold_jobs_in_build = False |
| 3590 | self.executor_server.release() |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3591 | self.waitUntilSettled() |
| 3592 | |
| 3593 | running_items = client.get_running_jobs() |
| 3594 | self.assertEqual(0, len(running_items)) |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3595 | |
James E. Blair | b70e55a | 2017-04-19 12:57:02 -0700 | [diff] [blame] | 3596 | @simple_layout('layouts/nonvoting-pipeline.yaml') |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3597 | def test_nonvoting_pipeline(self): |
| 3598 | "Test that a nonvoting pipeline (experimental) can still report" |
| 3599 | |
Joshua Hesketh | cc017ea | 2014-04-30 19:55:25 +1000 | [diff] [blame] | 3600 | A = self.fake_gerrit.addFakeChange('org/experimental-project', |
| 3601 | 'master', 'A') |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3602 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3603 | self.waitUntilSettled() |
Paul Belanger | 15e3e20 | 2016-10-14 16:27:34 -0400 | [diff] [blame] | 3604 | |
| 3605 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 3606 | 'SUCCESS') |
Joshua Hesketh | cc017ea | 2014-04-30 19:55:25 +1000 | [diff] [blame] | 3607 | self.assertEqual( |
| 3608 | self.getJobFromHistory('experimental-project-test').result, |
| 3609 | 'SUCCESS') |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3610 | self.assertEqual(A.reported, 1) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3611 | |
| 3612 | def test_crd_gate(self): |
| 3613 | "Test cross-repo dependencies" |
| 3614 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3615 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3616 | A.addApproval('code-review', 2) |
| 3617 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3618 | |
| 3619 | AM2 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM2') |
| 3620 | AM1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM1') |
| 3621 | AM2.setMerged() |
| 3622 | AM1.setMerged() |
| 3623 | |
| 3624 | BM2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM2') |
| 3625 | BM1 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM1') |
| 3626 | BM2.setMerged() |
| 3627 | BM1.setMerged() |
| 3628 | |
| 3629 | # A -> AM1 -> AM2 |
| 3630 | # B -> BM1 -> BM2 |
| 3631 | # A Depends-On: B |
| 3632 | # M2 is here to make sure it is never queried. If it is, it |
| 3633 | # means zuul is walking down the entire history of merged |
| 3634 | # changes. |
| 3635 | |
| 3636 | B.setDependsOn(BM1, 1) |
| 3637 | BM1.setDependsOn(BM2, 1) |
| 3638 | |
| 3639 | A.setDependsOn(AM1, 1) |
| 3640 | AM1.setDependsOn(AM2, 1) |
| 3641 | |
| 3642 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3643 | A.subject, B.data['id']) |
| 3644 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3645 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3646 | self.waitUntilSettled() |
| 3647 | |
| 3648 | self.assertEqual(A.data['status'], 'NEW') |
| 3649 | self.assertEqual(B.data['status'], 'NEW') |
| 3650 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3651 | for connection in self.connections.connections.values(): |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 3652 | connection.maintainCache([]) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3653 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3654 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3655 | B.addApproval('approved', 1) |
| 3656 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3657 | self.waitUntilSettled() |
| 3658 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3659 | self.executor_server.release('.*-merge') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3660 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3661 | self.executor_server.release('.*-merge') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3662 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3663 | self.executor_server.hold_jobs_in_build = False |
| 3664 | self.executor_server.release() |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3665 | self.waitUntilSettled() |
| 3666 | |
| 3667 | self.assertEqual(AM2.queried, 0) |
| 3668 | self.assertEqual(BM2.queried, 0) |
| 3669 | self.assertEqual(A.data['status'], 'MERGED') |
| 3670 | self.assertEqual(B.data['status'], 'MERGED') |
| 3671 | self.assertEqual(A.reported, 2) |
| 3672 | self.assertEqual(B.reported, 2) |
| 3673 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3674 | changes = self.getJobFromHistory( |
| 3675 | 'project-merge', 'org/project1').changes |
| 3676 | self.assertEqual(changes, '2,1 1,1') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3677 | |
| 3678 | def test_crd_branch(self): |
| 3679 | "Test cross-repo dependencies in multiple branches" |
Paul Belanger | 6379db1 | 2016-11-14 13:57:54 -0500 | [diff] [blame] | 3680 | |
| 3681 | self.create_branch('org/project2', 'mp') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3682 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3683 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 3684 | C = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C') |
| 3685 | C.data['id'] = B.data['id'] |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3686 | A.addApproval('code-review', 2) |
| 3687 | B.addApproval('code-review', 2) |
| 3688 | C.addApproval('code-review', 2) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3689 | |
| 3690 | # A Depends-On: B+C |
| 3691 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3692 | A.subject, B.data['id']) |
| 3693 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3694 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3695 | B.addApproval('approved', 1) |
| 3696 | C.addApproval('approved', 1) |
| 3697 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3698 | self.waitUntilSettled() |
| 3699 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3700 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3701 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3702 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3703 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3704 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3705 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3706 | self.executor_server.hold_jobs_in_build = False |
| 3707 | self.executor_server.release() |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3708 | self.waitUntilSettled() |
| 3709 | |
| 3710 | self.assertEqual(A.data['status'], 'MERGED') |
| 3711 | self.assertEqual(B.data['status'], 'MERGED') |
| 3712 | self.assertEqual(C.data['status'], 'MERGED') |
| 3713 | self.assertEqual(A.reported, 2) |
| 3714 | self.assertEqual(B.reported, 2) |
| 3715 | self.assertEqual(C.reported, 2) |
| 3716 | |
Paul Belanger | 6379db1 | 2016-11-14 13:57:54 -0500 | [diff] [blame] | 3717 | changes = self.getJobFromHistory( |
| 3718 | 'project-merge', 'org/project1').changes |
| 3719 | self.assertEqual(changes, '2,1 3,1 1,1') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3720 | |
| 3721 | def test_crd_multiline(self): |
| 3722 | "Test multiple depends-on lines in commit" |
| 3723 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3724 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 3725 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3726 | A.addApproval('code-review', 2) |
| 3727 | B.addApproval('code-review', 2) |
| 3728 | C.addApproval('code-review', 2) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3729 | |
| 3730 | # A Depends-On: B+C |
| 3731 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\nDepends-On: %s\n' % ( |
| 3732 | A.subject, B.data['id'], C.data['id']) |
| 3733 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3734 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3735 | B.addApproval('approved', 1) |
| 3736 | C.addApproval('approved', 1) |
| 3737 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3738 | self.waitUntilSettled() |
| 3739 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3740 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3741 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3742 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3743 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3744 | self.executor_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3745 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3746 | self.executor_server.hold_jobs_in_build = False |
| 3747 | self.executor_server.release() |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3748 | self.waitUntilSettled() |
| 3749 | |
| 3750 | self.assertEqual(A.data['status'], 'MERGED') |
| 3751 | self.assertEqual(B.data['status'], 'MERGED') |
| 3752 | self.assertEqual(C.data['status'], 'MERGED') |
| 3753 | self.assertEqual(A.reported, 2) |
| 3754 | self.assertEqual(B.reported, 2) |
| 3755 | self.assertEqual(C.reported, 2) |
| 3756 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3757 | changes = self.getJobFromHistory( |
| 3758 | 'project-merge', 'org/project1').changes |
| 3759 | self.assertEqual(changes, '2,1 3,1 1,1') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3760 | |
| 3761 | def test_crd_unshared_gate(self): |
| 3762 | "Test cross-repo dependencies in unshared gate queues" |
| 3763 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3764 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3765 | A.addApproval('code-review', 2) |
| 3766 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3767 | |
| 3768 | # A Depends-On: B |
| 3769 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3770 | A.subject, B.data['id']) |
| 3771 | |
| 3772 | # A and B do not share a queue, make sure that A is unable to |
| 3773 | # enqueue B (and therefore, A is unable to be enqueued). |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3774 | B.addApproval('approved', 1) |
| 3775 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3776 | self.waitUntilSettled() |
| 3777 | |
| 3778 | self.assertEqual(A.data['status'], 'NEW') |
| 3779 | self.assertEqual(B.data['status'], 'NEW') |
| 3780 | self.assertEqual(A.reported, 0) |
| 3781 | self.assertEqual(B.reported, 0) |
| 3782 | self.assertEqual(len(self.history), 0) |
| 3783 | |
| 3784 | # Enqueue and merge B alone. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3785 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3786 | self.waitUntilSettled() |
| 3787 | |
| 3788 | self.assertEqual(B.data['status'], 'MERGED') |
| 3789 | self.assertEqual(B.reported, 2) |
| 3790 | |
| 3791 | # Now that B is merged, A should be able to be enqueued and |
| 3792 | # merged. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3793 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3794 | self.waitUntilSettled() |
| 3795 | |
| 3796 | self.assertEqual(A.data['status'], 'MERGED') |
| 3797 | self.assertEqual(A.reported, 2) |
| 3798 | |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3799 | def test_crd_gate_reverse(self): |
| 3800 | "Test reverse cross-repo dependencies" |
| 3801 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3802 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3803 | A.addApproval('code-review', 2) |
| 3804 | B.addApproval('code-review', 2) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3805 | |
| 3806 | # A Depends-On: B |
| 3807 | |
| 3808 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3809 | A.subject, B.data['id']) |
| 3810 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3811 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3812 | self.waitUntilSettled() |
| 3813 | |
| 3814 | self.assertEqual(A.data['status'], 'NEW') |
| 3815 | self.assertEqual(B.data['status'], 'NEW') |
| 3816 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3817 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3818 | A.addApproval('approved', 1) |
| 3819 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3820 | self.waitUntilSettled() |
| 3821 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3822 | self.executor_server.release('.*-merge') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3823 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3824 | self.executor_server.release('.*-merge') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3825 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3826 | self.executor_server.hold_jobs_in_build = False |
| 3827 | self.executor_server.release() |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3828 | self.waitUntilSettled() |
| 3829 | |
| 3830 | self.assertEqual(A.data['status'], 'MERGED') |
| 3831 | self.assertEqual(B.data['status'], 'MERGED') |
| 3832 | self.assertEqual(A.reported, 2) |
| 3833 | self.assertEqual(B.reported, 2) |
| 3834 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3835 | changes = self.getJobFromHistory( |
| 3836 | 'project-merge', 'org/project1').changes |
| 3837 | self.assertEqual(changes, '2,1 1,1') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3838 | |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3839 | def test_crd_cycle(self): |
| 3840 | "Test cross-repo dependency cycles" |
| 3841 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3842 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3843 | A.addApproval('code-review', 2) |
| 3844 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3845 | |
| 3846 | # A -> B -> A (via commit-depends) |
| 3847 | |
| 3848 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3849 | A.subject, B.data['id']) |
| 3850 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3851 | B.subject, A.data['id']) |
| 3852 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3853 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3854 | self.waitUntilSettled() |
| 3855 | |
| 3856 | self.assertEqual(A.reported, 0) |
| 3857 | self.assertEqual(B.reported, 0) |
| 3858 | self.assertEqual(A.data['status'], 'NEW') |
| 3859 | self.assertEqual(B.data['status'], 'NEW') |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3860 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3861 | def test_crd_gate_unknown(self): |
| 3862 | "Test unknown projects in dependent pipeline" |
James E. Blair | c4ba97a | 2017-04-19 16:26:24 -0700 | [diff] [blame] | 3863 | self.init_repo("org/unknown", tag='init') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3864 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3865 | B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3866 | A.addApproval('code-review', 2) |
| 3867 | B.addApproval('code-review', 2) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3868 | |
| 3869 | # A Depends-On: B |
| 3870 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3871 | A.subject, B.data['id']) |
| 3872 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3873 | B.addApproval('approved', 1) |
| 3874 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3875 | self.waitUntilSettled() |
| 3876 | |
| 3877 | # Unknown projects cannot share a queue with any other |
| 3878 | # since they don't have common jobs with any other (they have no jobs). |
| 3879 | # Changes which depend on unknown project changes |
| 3880 | # should not be processed in dependent pipeline |
| 3881 | self.assertEqual(A.data['status'], 'NEW') |
| 3882 | self.assertEqual(B.data['status'], 'NEW') |
| 3883 | self.assertEqual(A.reported, 0) |
| 3884 | self.assertEqual(B.reported, 0) |
| 3885 | self.assertEqual(len(self.history), 0) |
| 3886 | |
James E. Blair | 7720b40 | 2017-06-07 08:51:49 -0700 | [diff] [blame] | 3887 | # Simulate change B being gated outside this layout Set the |
| 3888 | # change merged before submitting the event so that when the |
| 3889 | # event triggers a gerrit query to update the change, we get |
| 3890 | # the information that it was merged. |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3891 | B.setMerged() |
James E. Blair | 7720b40 | 2017-06-07 08:51:49 -0700 | [diff] [blame] | 3892 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3893 | self.waitUntilSettled() |
| 3894 | self.assertEqual(len(self.history), 0) |
| 3895 | |
| 3896 | # Now that B is merged, A should be able to be enqueued and |
| 3897 | # merged. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3898 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 3899 | self.waitUntilSettled() |
| 3900 | |
| 3901 | self.assertEqual(A.data['status'], 'MERGED') |
| 3902 | self.assertEqual(A.reported, 2) |
| 3903 | self.assertEqual(B.data['status'], 'MERGED') |
| 3904 | self.assertEqual(B.reported, 0) |
| 3905 | |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3906 | def test_crd_check(self): |
| 3907 | "Test cross-repo dependencies in independent pipelines" |
| 3908 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3909 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3910 | self.gearman_server.hold_jobs_in_queue = True |
| 3911 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3912 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 3913 | |
| 3914 | # A Depends-On: B |
| 3915 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3916 | A.subject, B.data['id']) |
| 3917 | |
| 3918 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3919 | self.waitUntilSettled() |
| 3920 | |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3921 | self.gearman_server.hold_jobs_in_queue = False |
| 3922 | self.gearman_server.release() |
| 3923 | self.waitUntilSettled() |
| 3924 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3925 | self.executor_server.release('.*-merge') |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 3926 | self.waitUntilSettled() |
| 3927 | |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 3928 | self.assertTrue(self.builds[0].hasChanges(A, B)) |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3929 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3930 | self.executor_server.hold_jobs_in_build = False |
| 3931 | self.executor_server.release() |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 3932 | self.waitUntilSettled() |
| 3933 | |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 3934 | self.assertEqual(A.data['status'], 'NEW') |
| 3935 | self.assertEqual(B.data['status'], 'NEW') |
| 3936 | self.assertEqual(A.reported, 1) |
| 3937 | self.assertEqual(B.reported, 0) |
| 3938 | |
| 3939 | self.assertEqual(self.history[0].changes, '2,1 1,1') |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 3940 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 3941 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3942 | |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3943 | def test_crd_check_git_depends(self): |
| 3944 | "Test single-repo dependencies in independent pipelines" |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 3945 | self.gearman_server.hold_jobs_in_build = True |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3946 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3947 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 3948 | |
| 3949 | # Add two git-dependent changes and make sure they both report |
| 3950 | # success. |
| 3951 | B.setDependsOn(A, 1) |
| 3952 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3953 | self.waitUntilSettled() |
| 3954 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 3955 | self.waitUntilSettled() |
| 3956 | |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 3957 | self.orderedRelease() |
| 3958 | self.gearman_server.hold_jobs_in_build = False |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3959 | self.waitUntilSettled() |
| 3960 | |
| 3961 | self.assertEqual(A.data['status'], 'NEW') |
| 3962 | self.assertEqual(B.data['status'], 'NEW') |
| 3963 | self.assertEqual(A.reported, 1) |
| 3964 | self.assertEqual(B.reported, 1) |
| 3965 | |
| 3966 | self.assertEqual(self.history[0].changes, '1,1') |
| 3967 | self.assertEqual(self.history[-1].changes, '1,1 2,1') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 3968 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 3969 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3970 | |
| 3971 | self.assertIn('Build succeeded', A.messages[0]) |
| 3972 | self.assertIn('Build succeeded', B.messages[0]) |
| 3973 | |
| 3974 | def test_crd_check_duplicate(self): |
| 3975 | "Test duplicate check in independent pipelines" |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 3976 | self.executor_server.hold_jobs_in_build = True |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3977 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3978 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 3979 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 3980 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 3981 | |
| 3982 | # Add two git-dependent changes... |
| 3983 | B.setDependsOn(A, 1) |
| 3984 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 3985 | self.waitUntilSettled() |
| 3986 | self.assertEqual(len(check_pipeline.getAllItems()), 2) |
| 3987 | |
| 3988 | # ...make sure the live one is not duplicated... |
| 3989 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 3990 | self.waitUntilSettled() |
| 3991 | self.assertEqual(len(check_pipeline.getAllItems()), 2) |
| 3992 | |
| 3993 | # ...but the non-live one is able to be. |
| 3994 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3995 | self.waitUntilSettled() |
| 3996 | self.assertEqual(len(check_pipeline.getAllItems()), 3) |
| 3997 | |
Clark Boylan | dd84982 | 2015-03-02 12:38:14 -0800 | [diff] [blame] | 3998 | # Release jobs in order to avoid races with change A jobs |
| 3999 | # finishing before change B jobs. |
James E. Blair | d765085 | 2015-05-07 15:47:37 -0700 | [diff] [blame] | 4000 | self.orderedRelease() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4001 | self.executor_server.hold_jobs_in_build = False |
| 4002 | self.executor_server.release() |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4003 | self.waitUntilSettled() |
| 4004 | |
| 4005 | self.assertEqual(A.data['status'], 'NEW') |
| 4006 | self.assertEqual(B.data['status'], 'NEW') |
| 4007 | self.assertEqual(A.reported, 1) |
| 4008 | self.assertEqual(B.reported, 1) |
| 4009 | |
| 4010 | self.assertEqual(self.history[0].changes, '1,1 2,1') |
| 4011 | self.assertEqual(self.history[1].changes, '1,1') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 4012 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4013 | |
| 4014 | self.assertIn('Build succeeded', A.messages[0]) |
| 4015 | self.assertIn('Build succeeded', B.messages[0]) |
| 4016 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4017 | def _test_crd_check_reconfiguration(self, project1, project2): |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4018 | "Test cross-repo dependencies re-enqueued in independent pipelines" |
| 4019 | |
| 4020 | self.gearman_server.hold_jobs_in_queue = True |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4021 | A = self.fake_gerrit.addFakeChange(project1, 'master', 'A') |
| 4022 | B = self.fake_gerrit.addFakeChange(project2, 'master', 'B') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4023 | |
| 4024 | # A Depends-On: B |
| 4025 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4026 | A.subject, B.data['id']) |
| 4027 | |
| 4028 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4029 | self.waitUntilSettled() |
| 4030 | |
| 4031 | self.sched.reconfigure(self.config) |
| 4032 | |
| 4033 | # Make sure the items still share a change queue, and the |
| 4034 | # first one is not live. |
Paul Belanger | ce4485f | 2016-11-11 17:01:56 -0500 | [diff] [blame] | 4035 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4036 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 1) |
| 4037 | queue = tenant.layout.pipelines['check'].queues[0] |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4038 | first_item = queue.queue[0] |
| 4039 | for item in queue.queue: |
| 4040 | self.assertEqual(item.queue, first_item.queue) |
| 4041 | self.assertFalse(first_item.live) |
| 4042 | self.assertTrue(queue.queue[1].live) |
| 4043 | |
| 4044 | self.gearman_server.hold_jobs_in_queue = False |
| 4045 | self.gearman_server.release() |
| 4046 | self.waitUntilSettled() |
| 4047 | |
| 4048 | self.assertEqual(A.data['status'], 'NEW') |
| 4049 | self.assertEqual(B.data['status'], 'NEW') |
| 4050 | self.assertEqual(A.reported, 1) |
| 4051 | self.assertEqual(B.reported, 0) |
| 4052 | |
| 4053 | self.assertEqual(self.history[0].changes, '2,1 1,1') |
Paul Belanger | ce4485f | 2016-11-11 17:01:56 -0500 | [diff] [blame] | 4054 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4055 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4056 | def test_crd_check_reconfiguration(self): |
| 4057 | self._test_crd_check_reconfiguration('org/project1', 'org/project2') |
| 4058 | |
| 4059 | def test_crd_undefined_project(self): |
| 4060 | """Test that undefined projects in dependencies are handled for |
| 4061 | independent pipelines""" |
| 4062 | # It's a hack for fake gerrit, |
| 4063 | # as it implies repo creation upon the creation of any change |
James E. Blair | c4ba97a | 2017-04-19 16:26:24 -0700 | [diff] [blame] | 4064 | self.init_repo("org/unknown", tag='init') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4065 | self._test_crd_check_reconfiguration('org/project1', 'org/unknown') |
| 4066 | |
Jesse Keating | ea68ab4 | 2017-04-19 15:03:30 -0700 | [diff] [blame] | 4067 | @simple_layout('layouts/ignore-dependencies.yaml') |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4068 | def test_crd_check_ignore_dependencies(self): |
| 4069 | "Test cross-repo dependencies can be ignored" |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4070 | |
| 4071 | self.gearman_server.hold_jobs_in_queue = True |
| 4072 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4073 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 4074 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 4075 | |
| 4076 | # A Depends-On: B |
| 4077 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4078 | A.subject, B.data['id']) |
| 4079 | # C git-depends on B |
| 4080 | C.setDependsOn(B, 1) |
| 4081 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4082 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4083 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4084 | self.waitUntilSettled() |
| 4085 | |
| 4086 | # Make sure none of the items share a change queue, and all |
| 4087 | # are live. |
Jesse Keating | ea68ab4 | 2017-04-19 15:03:30 -0700 | [diff] [blame] | 4088 | tenant = self.sched.abide.tenants.get('tenant-one') |
Clint Byrum | 12282ca | 2017-04-03 11:04:02 -0700 | [diff] [blame] | 4089 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4090 | self.assertEqual(len(check_pipeline.queues), 3) |
| 4091 | self.assertEqual(len(check_pipeline.getAllItems()), 3) |
| 4092 | for item in check_pipeline.getAllItems(): |
| 4093 | self.assertTrue(item.live) |
| 4094 | |
| 4095 | self.gearman_server.hold_jobs_in_queue = False |
| 4096 | self.gearman_server.release() |
| 4097 | self.waitUntilSettled() |
| 4098 | |
| 4099 | self.assertEqual(A.data['status'], 'NEW') |
| 4100 | self.assertEqual(B.data['status'], 'NEW') |
| 4101 | self.assertEqual(C.data['status'], 'NEW') |
| 4102 | self.assertEqual(A.reported, 1) |
| 4103 | self.assertEqual(B.reported, 1) |
| 4104 | self.assertEqual(C.reported, 1) |
| 4105 | |
| 4106 | # Each job should have tested exactly one change |
| 4107 | for job in self.history: |
| 4108 | self.assertEqual(len(job.changes.split()), 1) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4109 | |
James E. Blair | 7cb8454 | 2017-04-19 13:35:05 -0700 | [diff] [blame] | 4110 | @simple_layout('layouts/three-projects.yaml') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4111 | def test_crd_check_transitive(self): |
| 4112 | "Test transitive cross-repo dependencies" |
| 4113 | # Specifically, if A -> B -> C, and C gets a new patchset and |
| 4114 | # A gets a new patchset, ensure the test of A,2 includes B,1 |
| 4115 | # and C,2 (not C,1 which would indicate stale data in the |
| 4116 | # cache for B). |
| 4117 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4118 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 4119 | C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C') |
| 4120 | |
| 4121 | # A Depends-On: B |
| 4122 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4123 | A.subject, B.data['id']) |
| 4124 | |
| 4125 | # B Depends-On: C |
| 4126 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4127 | B.subject, C.data['id']) |
| 4128 | |
| 4129 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4130 | self.waitUntilSettled() |
| 4131 | self.assertEqual(self.history[-1].changes, '3,1 2,1 1,1') |
| 4132 | |
| 4133 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4134 | self.waitUntilSettled() |
| 4135 | self.assertEqual(self.history[-1].changes, '3,1 2,1') |
| 4136 | |
| 4137 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4138 | self.waitUntilSettled() |
| 4139 | self.assertEqual(self.history[-1].changes, '3,1') |
| 4140 | |
| 4141 | C.addPatchset() |
| 4142 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(2)) |
| 4143 | self.waitUntilSettled() |
| 4144 | self.assertEqual(self.history[-1].changes, '3,2') |
| 4145 | |
| 4146 | A.addPatchset() |
| 4147 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 4148 | self.waitUntilSettled() |
| 4149 | self.assertEqual(self.history[-1].changes, '3,2 2,1 1,2') |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4150 | |
James E. Blair | a8b90b3 | 2016-08-24 15:18:50 -0700 | [diff] [blame] | 4151 | def test_crd_check_unknown(self): |
| 4152 | "Test unknown projects in independent pipeline" |
James E. Blair | c4ba97a | 2017-04-19 16:26:24 -0700 | [diff] [blame] | 4153 | self.init_repo("org/unknown", tag='init') |
James E. Blair | a8b90b3 | 2016-08-24 15:18:50 -0700 | [diff] [blame] | 4154 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4155 | B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D') |
| 4156 | # A Depends-On: B |
| 4157 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4158 | A.subject, B.data['id']) |
| 4159 | |
| 4160 | # Make sure zuul has seen an event on B. |
| 4161 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4162 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4163 | self.waitUntilSettled() |
| 4164 | |
| 4165 | self.assertEqual(A.data['status'], 'NEW') |
| 4166 | self.assertEqual(A.reported, 1) |
| 4167 | self.assertEqual(B.data['status'], 'NEW') |
| 4168 | self.assertEqual(B.reported, 0) |
| 4169 | |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4170 | def test_crd_cycle_join(self): |
| 4171 | "Test an updated change creates a cycle" |
| 4172 | A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A') |
| 4173 | |
| 4174 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4175 | self.waitUntilSettled() |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4176 | self.assertEqual(A.reported, 1) |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4177 | |
| 4178 | # Create B->A |
| 4179 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 4180 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4181 | B.subject, A.data['id']) |
| 4182 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4183 | self.waitUntilSettled() |
| 4184 | |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4185 | # Dep is there so zuul should have reported on B |
| 4186 | self.assertEqual(B.reported, 1) |
| 4187 | |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4188 | # Update A to add A->B (a cycle). |
| 4189 | A.addPatchset() |
| 4190 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4191 | A.subject, B.data['id']) |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4192 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 4193 | self.waitUntilSettled() |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4194 | |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4195 | # Dependency cycle injected so zuul should not have reported again on A |
| 4196 | self.assertEqual(A.reported, 1) |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4197 | |
| 4198 | # Now if we update B to remove the depends-on, everything |
| 4199 | # should be okay. B; A->B |
| 4200 | |
| 4201 | B.addPatchset() |
| 4202 | B.data['commitMessage'] = '%s\n' % (B.subject,) |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4203 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 4204 | self.waitUntilSettled() |
Paul Belanger | 0e155e2 | 2016-11-14 14:12:23 -0500 | [diff] [blame] | 4205 | |
Tobias Henkel | 6b9390f | 2017-03-28 11:23:21 +0200 | [diff] [blame] | 4206 | # Cycle was removed so now zuul should have reported again on A |
| 4207 | self.assertEqual(A.reported, 2) |
| 4208 | |
| 4209 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 4210 | self.waitUntilSettled() |
| 4211 | self.assertEqual(B.reported, 2) |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4212 | |
Jesse Keating | cc67b12 | 2017-04-19 14:54:57 -0700 | [diff] [blame] | 4213 | @simple_layout('layouts/disable_at.yaml') |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4214 | def test_disable_at(self): |
| 4215 | "Test a pipeline will only report to the disabled trigger when failing" |
| 4216 | |
Jesse Keating | cc67b12 | 2017-04-19 14:54:57 -0700 | [diff] [blame] | 4217 | tenant = self.sched.abide.tenants.get('tenant-one') |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4218 | self.assertEqual(3, tenant.layout.pipelines['check'].disable_at) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4219 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4220 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4221 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4222 | |
| 4223 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4224 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 4225 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 4226 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 4227 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
| 4228 | F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F') |
| 4229 | G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G') |
| 4230 | H = self.fake_gerrit.addFakeChange('org/project', 'master', 'H') |
| 4231 | I = self.fake_gerrit.addFakeChange('org/project', 'master', 'I') |
| 4232 | J = self.fake_gerrit.addFakeChange('org/project', 'master', 'J') |
| 4233 | K = self.fake_gerrit.addFakeChange('org/project', 'master', 'K') |
| 4234 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4235 | self.executor_server.failJob('project-test1', A) |
| 4236 | self.executor_server.failJob('project-test1', B) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4237 | # Let C pass, resetting the counter |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4238 | self.executor_server.failJob('project-test1', D) |
| 4239 | self.executor_server.failJob('project-test1', E) |
| 4240 | self.executor_server.failJob('project-test1', F) |
| 4241 | self.executor_server.failJob('project-test1', G) |
| 4242 | self.executor_server.failJob('project-test1', H) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4243 | # I also passes but should only report to the disabled reporters |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4244 | self.executor_server.failJob('project-test1', J) |
| 4245 | self.executor_server.failJob('project-test1', K) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4246 | |
| 4247 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4248 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4249 | self.waitUntilSettled() |
| 4250 | |
| 4251 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4252 | 2, tenant.layout.pipelines['check']._consecutive_failures) |
| 4253 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4254 | |
| 4255 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4256 | self.waitUntilSettled() |
| 4257 | |
| 4258 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4259 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4260 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4261 | |
| 4262 | self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1)) |
| 4263 | self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1)) |
| 4264 | self.fake_gerrit.addEvent(F.getPatchsetCreatedEvent(1)) |
| 4265 | self.waitUntilSettled() |
| 4266 | |
| 4267 | # We should be disabled now |
| 4268 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4269 | 3, tenant.layout.pipelines['check']._consecutive_failures) |
| 4270 | self.assertTrue(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4271 | |
| 4272 | # We need to wait between each of these patches to make sure the |
| 4273 | # smtp messages come back in an expected order |
| 4274 | self.fake_gerrit.addEvent(G.getPatchsetCreatedEvent(1)) |
| 4275 | self.waitUntilSettled() |
| 4276 | self.fake_gerrit.addEvent(H.getPatchsetCreatedEvent(1)) |
| 4277 | self.waitUntilSettled() |
| 4278 | self.fake_gerrit.addEvent(I.getPatchsetCreatedEvent(1)) |
| 4279 | self.waitUntilSettled() |
| 4280 | |
| 4281 | # The first 6 (ABCDEF) jobs should have reported back to gerrt thus |
| 4282 | # leaving a message on each change |
| 4283 | self.assertEqual(1, len(A.messages)) |
| 4284 | self.assertIn('Build failed.', A.messages[0]) |
| 4285 | self.assertEqual(1, len(B.messages)) |
| 4286 | self.assertIn('Build failed.', B.messages[0]) |
| 4287 | self.assertEqual(1, len(C.messages)) |
| 4288 | self.assertIn('Build succeeded.', C.messages[0]) |
| 4289 | self.assertEqual(1, len(D.messages)) |
| 4290 | self.assertIn('Build failed.', D.messages[0]) |
| 4291 | self.assertEqual(1, len(E.messages)) |
| 4292 | self.assertIn('Build failed.', E.messages[0]) |
| 4293 | self.assertEqual(1, len(F.messages)) |
| 4294 | self.assertIn('Build failed.', F.messages[0]) |
| 4295 | |
| 4296 | # The last 3 (GHI) would have only reported via smtp. |
| 4297 | self.assertEqual(3, len(self.smtp_messages)) |
| 4298 | self.assertEqual(0, len(G.messages)) |
| 4299 | self.assertIn('Build failed.', self.smtp_messages[0]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4300 | self.assertIn( |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 4301 | 'project-test1 finger://', self.smtp_messages[0]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4302 | self.assertEqual(0, len(H.messages)) |
| 4303 | self.assertIn('Build failed.', self.smtp_messages[1]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4304 | self.assertIn( |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 4305 | 'project-test1 finger://', self.smtp_messages[1]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4306 | self.assertEqual(0, len(I.messages)) |
| 4307 | self.assertIn('Build succeeded.', self.smtp_messages[2]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4308 | self.assertIn( |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 4309 | 'project-test1 finger://', self.smtp_messages[2]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4310 | |
| 4311 | # Now reload the configuration (simulate a HUP) to check the pipeline |
| 4312 | # comes out of disabled |
| 4313 | self.sched.reconfigure(self.config) |
| 4314 | |
Jesse Keating | cc67b12 | 2017-04-19 14:54:57 -0700 | [diff] [blame] | 4315 | tenant = self.sched.abide.tenants.get('tenant-one') |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4316 | |
| 4317 | self.assertEqual(3, tenant.layout.pipelines['check'].disable_at) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4318 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4319 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4320 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4321 | |
| 4322 | self.fake_gerrit.addEvent(J.getPatchsetCreatedEvent(1)) |
| 4323 | self.fake_gerrit.addEvent(K.getPatchsetCreatedEvent(1)) |
| 4324 | self.waitUntilSettled() |
| 4325 | |
| 4326 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4327 | 2, tenant.layout.pipelines['check']._consecutive_failures) |
| 4328 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4329 | |
| 4330 | # J and K went back to gerrit |
| 4331 | self.assertEqual(1, len(J.messages)) |
| 4332 | self.assertIn('Build failed.', J.messages[0]) |
| 4333 | self.assertEqual(1, len(K.messages)) |
| 4334 | self.assertIn('Build failed.', K.messages[0]) |
| 4335 | # No more messages reported via smtp |
| 4336 | self.assertEqual(3, len(self.smtp_messages)) |
Joshua Hesketh | d6dbd68 | 2015-12-22 10:06:54 +1100 | [diff] [blame] | 4337 | |
James E. Blair | cc02053 | 2017-04-19 13:04:44 -0700 | [diff] [blame] | 4338 | @simple_layout('layouts/one-job-project.yaml') |
| 4339 | def test_one_job_project(self): |
| 4340 | "Test that queueing works with one job" |
| 4341 | A = self.fake_gerrit.addFakeChange('org/one-job-project', |
| 4342 | 'master', 'A') |
| 4343 | B = self.fake_gerrit.addFakeChange('org/one-job-project', |
| 4344 | 'master', 'B') |
| 4345 | A.addApproval('code-review', 2) |
| 4346 | B.addApproval('code-review', 2) |
| 4347 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4348 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 4349 | self.waitUntilSettled() |
| 4350 | |
| 4351 | self.assertEqual(A.data['status'], 'MERGED') |
| 4352 | self.assertEqual(A.reported, 2) |
| 4353 | self.assertEqual(B.data['status'], 'MERGED') |
| 4354 | self.assertEqual(B.reported, 2) |
| 4355 | |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4356 | def test_rerun_on_abort(self): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4357 | "Test that if a execute server fails to run a job, it is run again" |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4358 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4359 | self.executor_server.hold_jobs_in_build = True |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4360 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4361 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4362 | self.waitUntilSettled() |
| 4363 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4364 | self.executor_server.release('.*-merge') |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4365 | self.waitUntilSettled() |
| 4366 | |
| 4367 | self.assertEqual(len(self.builds), 2) |
| 4368 | self.builds[0].requeue = True |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4369 | self.executor_server.release('.*-test*') |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4370 | self.waitUntilSettled() |
| 4371 | |
Clint Byrum | 5bb5feb | 2016-12-08 12:39:05 -0800 | [diff] [blame] | 4372 | for x in range(3): |
Clint Byrum | df0a55b | 2016-12-05 06:39:11 -0800 | [diff] [blame] | 4373 | self.assertEqual(len(self.builds), 1, |
| 4374 | 'len of builds at x=%d is wrong' % x) |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4375 | self.builds[0].requeue = True |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4376 | self.executor_server.release('.*-test1') |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4377 | self.waitUntilSettled() |
| 4378 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4379 | self.executor_server.hold_jobs_in_build = False |
| 4380 | self.executor_server.release() |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4381 | self.waitUntilSettled() |
Clint Byrum | 5bb5feb | 2016-12-08 12:39:05 -0800 | [diff] [blame] | 4382 | self.assertEqual(len(self.history), 6) |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4383 | self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 2) |
| 4384 | self.assertEqual(A.reported, 1) |
| 4385 | self.assertIn('RETRY_LIMIT', A.messages[0]) |
Joshua Hesketh | 3f7def3 | 2016-11-21 17:36:44 +1100 | [diff] [blame] | 4386 | |
James E. Blair | 15be0e1 | 2017-01-03 13:45:20 -0800 | [diff] [blame] | 4387 | def test_zookeeper_disconnect(self): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4388 | "Test that jobs are executed after a zookeeper disconnect" |
James E. Blair | 15be0e1 | 2017-01-03 13:45:20 -0800 | [diff] [blame] | 4389 | |
| 4390 | self.fake_nodepool.paused = True |
| 4391 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4392 | A.addApproval('code-review', 2) |
| 4393 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4394 | self.waitUntilSettled() |
| 4395 | |
| 4396 | self.zk.client.stop() |
| 4397 | self.zk.client.start() |
| 4398 | self.fake_nodepool.paused = False |
| 4399 | self.waitUntilSettled() |
| 4400 | |
| 4401 | self.assertEqual(A.data['status'], 'MERGED') |
| 4402 | self.assertEqual(A.reported, 2) |
| 4403 | |
James E. Blair | 6ab79e0 | 2017-01-06 10:10:17 -0800 | [diff] [blame] | 4404 | def test_nodepool_failure(self): |
| 4405 | "Test that jobs are reported after a nodepool failure" |
| 4406 | |
| 4407 | self.fake_nodepool.paused = True |
| 4408 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4409 | A.addApproval('code-review', 2) |
| 4410 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4411 | self.waitUntilSettled() |
| 4412 | |
| 4413 | req = self.fake_nodepool.getNodeRequests()[0] |
| 4414 | self.fake_nodepool.addFailRequest(req) |
| 4415 | |
| 4416 | self.fake_nodepool.paused = False |
| 4417 | self.waitUntilSettled() |
| 4418 | |
| 4419 | self.assertEqual(A.data['status'], 'NEW') |
| 4420 | self.assertEqual(A.reported, 2) |
| 4421 | self.assertIn('project-merge : NODE_FAILURE', A.messages[1]) |
| 4422 | self.assertIn('project-test1 : SKIPPED', A.messages[1]) |
| 4423 | self.assertIn('project-test2 : SKIPPED', A.messages[1]) |
| 4424 | |
Arie | b6f068c | 2016-10-09 13:11:06 +0300 | [diff] [blame] | 4425 | |
James E. Blair | a002b03 | 2017-04-18 10:35:48 -0700 | [diff] [blame] | 4426 | class TestExecutor(ZuulTestCase): |
| 4427 | tenant_config_file = 'config/single-tenant/main.yaml' |
| 4428 | |
| 4429 | def assertFinalState(self): |
| 4430 | # In this test, we expect to shut down in a non-final state, |
| 4431 | # so skip these checks. |
| 4432 | pass |
| 4433 | |
| 4434 | def assertCleanShutdown(self): |
| 4435 | self.log.debug("Assert clean shutdown") |
| 4436 | |
| 4437 | # After shutdown, make sure no jobs are running |
| 4438 | self.assertEqual({}, self.executor_server.job_workers) |
| 4439 | |
| 4440 | # Make sure that git.Repo objects have been garbage collected. |
| 4441 | repos = [] |
| 4442 | gc.collect() |
| 4443 | for obj in gc.get_objects(): |
| 4444 | if isinstance(obj, git.Repo): |
| 4445 | self.log.debug("Leaked git repo object: %s" % repr(obj)) |
| 4446 | repos.append(obj) |
| 4447 | self.assertEqual(len(repos), 0) |
| 4448 | |
| 4449 | def test_executor_shutdown(self): |
| 4450 | "Test that the executor can shut down with jobs running" |
| 4451 | |
| 4452 | self.executor_server.hold_jobs_in_build = True |
| 4453 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4454 | A.addApproval('code-review', 2) |
| 4455 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4456 | self.waitUntilSettled() |
| 4457 | |
| 4458 | |
Fredrik Medley | f8aec83 | 2015-09-28 13:40:20 +0200 | [diff] [blame] | 4459 | class TestDependencyGraph(ZuulTestCase): |
| 4460 | tenant_config_file = 'config/dependency-graph/main.yaml' |
| 4461 | |
| 4462 | def test_dependeny_graph_dispatch_jobs_once(self): |
| 4463 | "Test a job in a dependency graph is queued only once" |
| 4464 | # Job dependencies, starting with A |
| 4465 | # A |
| 4466 | # / \ |
| 4467 | # B C |
| 4468 | # / \ / \ |
| 4469 | # D F E |
| 4470 | # | |
| 4471 | # G |
| 4472 | |
| 4473 | self.executor_server.hold_jobs_in_build = True |
| 4474 | change = self.fake_gerrit.addFakeChange( |
| 4475 | 'org/project', 'master', 'change') |
| 4476 | change.addApproval('code-review', 2) |
| 4477 | self.fake_gerrit.addEvent(change.addApproval('approved', 1)) |
| 4478 | |
| 4479 | self.waitUntilSettled() |
| 4480 | self.assertEqual([b.name for b in self.builds], ['A']) |
| 4481 | |
| 4482 | self.executor_server.release('A') |
| 4483 | self.waitUntilSettled() |
| 4484 | self.assertEqual(sorted(b.name for b in self.builds), ['B', 'C']) |
| 4485 | |
| 4486 | self.executor_server.release('B') |
| 4487 | self.waitUntilSettled() |
| 4488 | self.assertEqual(sorted(b.name for b in self.builds), ['C', 'D']) |
| 4489 | |
| 4490 | self.executor_server.release('D') |
| 4491 | self.waitUntilSettled() |
| 4492 | self.assertEqual([b.name for b in self.builds], ['C']) |
| 4493 | |
| 4494 | self.executor_server.release('C') |
| 4495 | self.waitUntilSettled() |
| 4496 | self.assertEqual(sorted(b.name for b in self.builds), ['E', 'F']) |
| 4497 | |
| 4498 | self.executor_server.release('F') |
| 4499 | self.waitUntilSettled() |
| 4500 | self.assertEqual(sorted(b.name for b in self.builds), ['E', 'G']) |
| 4501 | |
| 4502 | self.executor_server.release('G') |
| 4503 | self.waitUntilSettled() |
| 4504 | self.assertEqual([b.name for b in self.builds], ['E']) |
| 4505 | |
| 4506 | self.executor_server.release('E') |
| 4507 | self.waitUntilSettled() |
| 4508 | self.assertEqual(len(self.builds), 0) |
| 4509 | |
| 4510 | self.executor_server.hold_jobs_in_build = False |
| 4511 | self.executor_server.release() |
| 4512 | self.waitUntilSettled() |
| 4513 | |
| 4514 | self.assertEqual(len(self.builds), 0) |
| 4515 | self.assertEqual(len(self.history), 7) |
| 4516 | |
| 4517 | self.assertEqual(change.data['status'], 'MERGED') |
| 4518 | self.assertEqual(change.reported, 2) |
| 4519 | |
| 4520 | def test_jobs_launched_only_if_all_dependencies_are_successful(self): |
| 4521 | "Test that a job waits till all dependencies are successful" |
| 4522 | # Job dependencies, starting with A |
| 4523 | # A |
| 4524 | # / \ |
| 4525 | # B C* |
| 4526 | # / \ / \ |
| 4527 | # D F E |
| 4528 | # | |
| 4529 | # G |
| 4530 | |
| 4531 | self.executor_server.hold_jobs_in_build = True |
| 4532 | change = self.fake_gerrit.addFakeChange( |
| 4533 | 'org/project', 'master', 'change') |
| 4534 | change.addApproval('code-review', 2) |
| 4535 | |
| 4536 | self.executor_server.failJob('C', change) |
| 4537 | |
| 4538 | self.fake_gerrit.addEvent(change.addApproval('approved', 1)) |
| 4539 | |
| 4540 | self.waitUntilSettled() |
| 4541 | self.assertEqual([b.name for b in self.builds], ['A']) |
| 4542 | |
| 4543 | self.executor_server.release('A') |
| 4544 | self.waitUntilSettled() |
| 4545 | self.assertEqual(sorted(b.name for b in self.builds), ['B', 'C']) |
| 4546 | |
| 4547 | self.executor_server.release('B') |
| 4548 | self.waitUntilSettled() |
| 4549 | self.assertEqual(sorted(b.name for b in self.builds), ['C', 'D']) |
| 4550 | |
| 4551 | self.executor_server.release('D') |
| 4552 | self.waitUntilSettled() |
| 4553 | self.assertEqual([b.name for b in self.builds], ['C']) |
| 4554 | |
| 4555 | self.executor_server.release('C') |
| 4556 | self.waitUntilSettled() |
| 4557 | self.assertEqual(len(self.builds), 0) |
| 4558 | |
| 4559 | self.executor_server.hold_jobs_in_build = False |
| 4560 | self.executor_server.release() |
| 4561 | self.waitUntilSettled() |
| 4562 | |
| 4563 | self.assertEqual(len(self.builds), 0) |
| 4564 | self.assertEqual(len(self.history), 4) |
| 4565 | |
| 4566 | self.assertEqual(change.data['status'], 'NEW') |
| 4567 | self.assertEqual(change.reported, 2) |
| 4568 | |
| 4569 | |
Arie | b6f068c | 2016-10-09 13:11:06 +0300 | [diff] [blame] | 4570 | class TestDuplicatePipeline(ZuulTestCase): |
| 4571 | tenant_config_file = 'config/duplicate-pipeline/main.yaml' |
| 4572 | |
| 4573 | def test_duplicate_pipelines(self): |
| 4574 | "Test that a change matching multiple pipelines works" |
| 4575 | |
| 4576 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4577 | self.fake_gerrit.addEvent(A.getChangeRestoredEvent()) |
| 4578 | self.waitUntilSettled() |
| 4579 | |
| 4580 | self.assertHistory([ |
| 4581 | dict(name='project-test1', result='SUCCESS', changes='1,1', |
| 4582 | pipeline='dup1'), |
| 4583 | dict(name='project-test1', result='SUCCESS', changes='1,1', |
| 4584 | pipeline='dup2'), |
Paul Belanger | 73a7d8e | 2016-11-09 11:12:42 -0500 | [diff] [blame] | 4585 | ], ordered=False) |
Arie | b6f068c | 2016-10-09 13:11:06 +0300 | [diff] [blame] | 4586 | |
| 4587 | self.assertEqual(len(A.messages), 2) |
| 4588 | |
Paul Belanger | a46a374 | 2016-11-09 14:23:03 -0500 | [diff] [blame] | 4589 | if 'dup1' in A.messages[0]: |
| 4590 | self.assertIn('dup1', A.messages[0]) |
| 4591 | self.assertNotIn('dup2', A.messages[0]) |
| 4592 | self.assertIn('project-test1', A.messages[0]) |
| 4593 | self.assertIn('dup2', A.messages[1]) |
| 4594 | self.assertNotIn('dup1', A.messages[1]) |
| 4595 | self.assertIn('project-test1', A.messages[1]) |
| 4596 | else: |
| 4597 | self.assertIn('dup1', A.messages[1]) |
| 4598 | self.assertNotIn('dup2', A.messages[1]) |
| 4599 | self.assertIn('project-test1', A.messages[1]) |
| 4600 | self.assertIn('dup2', A.messages[0]) |
| 4601 | self.assertNotIn('dup1', A.messages[0]) |
| 4602 | self.assertIn('project-test1', A.messages[0]) |
Paul Belanger | fac69ba | 2016-11-03 09:03:13 -0400 | [diff] [blame] | 4603 | |
| 4604 | |
Paul Belanger | 86085b3 | 2016-11-03 12:48:57 -0400 | [diff] [blame] | 4605 | class TestSchedulerTemplatedProject(ZuulTestCase): |
| 4606 | tenant_config_file = 'config/templated-project/main.yaml' |
| 4607 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4608 | def test_job_from_templates_executed(self): |
| 4609 | "Test whether a job generated via a template can be executed" |
Paul Belanger | 86085b3 | 2016-11-03 12:48:57 -0400 | [diff] [blame] | 4610 | |
| 4611 | A = self.fake_gerrit.addFakeChange( |
| 4612 | 'org/templated-project', 'master', 'A') |
| 4613 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4614 | self.waitUntilSettled() |
| 4615 | |
| 4616 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 4617 | 'SUCCESS') |
| 4618 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 4619 | 'SUCCESS') |
Paul Belanger | 3adf72f | 2016-11-03 14:57:31 -0400 | [diff] [blame] | 4620 | |
| 4621 | def test_layered_templates(self): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4622 | "Test whether a job generated via a template can be executed" |
Paul Belanger | 3adf72f | 2016-11-03 14:57:31 -0400 | [diff] [blame] | 4623 | |
| 4624 | A = self.fake_gerrit.addFakeChange( |
| 4625 | 'org/layered-project', 'master', 'A') |
| 4626 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4627 | self.waitUntilSettled() |
| 4628 | |
| 4629 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 4630 | 'SUCCESS') |
| 4631 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 4632 | 'SUCCESS') |
| 4633 | self.assertEqual(self.getJobFromHistory('layered-project-test3' |
| 4634 | ).result, 'SUCCESS') |
| 4635 | self.assertEqual(self.getJobFromHistory('layered-project-test4' |
| 4636 | ).result, 'SUCCESS') |
| 4637 | self.assertEqual(self.getJobFromHistory('layered-project-foo-test5' |
| 4638 | ).result, 'SUCCESS') |
| 4639 | self.assertEqual(self.getJobFromHistory('project-test6').result, |
| 4640 | 'SUCCESS') |
Adam Gandelman | 94a6006 | 2016-11-21 16:43:14 -0800 | [diff] [blame] | 4641 | |
| 4642 | |
| 4643 | class TestSchedulerSuccessURL(ZuulTestCase): |
| 4644 | tenant_config_file = 'config/success-url/main.yaml' |
| 4645 | |
| 4646 | def test_success_url(self): |
| 4647 | "Ensure bad build params are ignored" |
| 4648 | self.sched.reconfigure(self.config) |
| 4649 | self.init_repo('org/docs') |
| 4650 | |
| 4651 | A = self.fake_gerrit.addFakeChange('org/docs', 'master', 'A') |
| 4652 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4653 | self.waitUntilSettled() |
| 4654 | |
| 4655 | # Both builds ran: docs-draft-test + docs-draft-test2 |
| 4656 | self.assertEqual(len(self.history), 2) |
| 4657 | |
| 4658 | # Grab build id |
James E. Blair | e757680 | 2016-12-21 16:15:00 -0800 | [diff] [blame] | 4659 | for build in self.history: |
| 4660 | if build.name == 'docs-draft-test': |
| 4661 | uuid = build.uuid[:7] |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 4662 | elif build.name == 'docs-draft-test2': |
| 4663 | uuid_test2 = build.uuid |
Adam Gandelman | 94a6006 | 2016-11-21 16:43:14 -0800 | [diff] [blame] | 4664 | |
| 4665 | # Two msgs: 'Starting...' + results |
| 4666 | self.assertEqual(len(self.smtp_messages), 2) |
| 4667 | body = self.smtp_messages[1]['body'].splitlines() |
| 4668 | self.assertEqual('Build succeeded.', body[0]) |
| 4669 | |
| 4670 | self.assertIn( |
| 4671 | '- docs-draft-test http://docs-draft.example.org/1/1/1/check/' |
| 4672 | 'docs-draft-test/%s/publish-docs/' % uuid, |
| 4673 | body[2]) |
| 4674 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4675 | # NOTE: This default URL is currently hard-coded in executor/server.py |
Adam Gandelman | 94a6006 | 2016-11-21 16:43:14 -0800 | [diff] [blame] | 4676 | self.assertIn( |
Monty Taylor | de8242c | 2017-02-23 20:29:53 -0600 | [diff] [blame] | 4677 | '- docs-draft-test2 finger://zl.example.com/{uuid}'.format( |
| 4678 | uuid=uuid_test2), |
Adam Gandelman | 94a6006 | 2016-11-21 16:43:14 -0800 | [diff] [blame] | 4679 | body[3]) |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4680 | |
| 4681 | |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4682 | class TestSchedulerMerges(ZuulTestCase): |
| 4683 | tenant_config_file = 'config/merges/main.yaml' |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4684 | |
| 4685 | def _test_project_merge_mode(self, mode): |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4686 | self.executor_server.keep_jobdir = False |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4687 | project = 'org/project-%s' % mode |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4688 | self.executor_server.hold_jobs_in_build = True |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4689 | A = self.fake_gerrit.addFakeChange(project, 'master', 'A') |
| 4690 | B = self.fake_gerrit.addFakeChange(project, 'master', 'B') |
| 4691 | C = self.fake_gerrit.addFakeChange(project, 'master', 'C') |
| 4692 | A.addApproval('code-review', 2) |
| 4693 | B.addApproval('code-review', 2) |
| 4694 | C.addApproval('code-review', 2) |
| 4695 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4696 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 4697 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 4698 | self.waitUntilSettled() |
| 4699 | |
| 4700 | build = self.builds[-1] |
| 4701 | ref = self.getParameter(build, 'ZUUL_REF') |
| 4702 | |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 4703 | path = os.path.join(build.jobdir.src_root, 'review.example.com', |
| 4704 | project) |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4705 | repo = git.Repo(path) |
| 4706 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 4707 | repo_messages.reverse() |
| 4708 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4709 | self.executor_server.hold_jobs_in_build = False |
| 4710 | self.executor_server.release() |
Adam Gandelman | 8bd5710 | 2016-12-02 12:58:42 -0800 | [diff] [blame] | 4711 | self.waitUntilSettled() |
| 4712 | |
| 4713 | return repo_messages |
| 4714 | |
| 4715 | def _test_merge(self, mode): |
| 4716 | us_path = os.path.join( |
| 4717 | self.upstream_root, 'org/project-%s' % mode) |
| 4718 | expected_messages = [ |
| 4719 | 'initial commit', |
| 4720 | 'add content from fixture', |
| 4721 | # the intermediate commits order is nondeterministic |
| 4722 | "Merge commit 'refs/changes/1/2/1' of %s into HEAD" % us_path, |
| 4723 | "Merge commit 'refs/changes/1/3/1' of %s into HEAD" % us_path, |
| 4724 | ] |
| 4725 | result = self._test_project_merge_mode(mode) |
| 4726 | self.assertEqual(result[:2], expected_messages[:2]) |
| 4727 | self.assertEqual(result[-2:], expected_messages[-2:]) |
| 4728 | |
| 4729 | def test_project_merge_mode_merge(self): |
| 4730 | self._test_merge('merge') |
| 4731 | |
| 4732 | def test_project_merge_mode_merge_resolve(self): |
| 4733 | self._test_merge('merge-resolve') |
| 4734 | |
| 4735 | def test_project_merge_mode_cherrypick(self): |
| 4736 | expected_messages = [ |
| 4737 | 'initial commit', |
| 4738 | 'add content from fixture', |
| 4739 | 'A-1', |
| 4740 | 'B-1', |
| 4741 | 'C-1'] |
| 4742 | result = self._test_project_merge_mode('cherry-pick') |
| 4743 | self.assertEqual(result, expected_messages) |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4744 | |
| 4745 | def test_merge_branch(self): |
| 4746 | "Test that the right commits are on alternate branches" |
| 4747 | self.create_branch('org/project-merge-branches', 'mp') |
| 4748 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4749 | self.executor_server.hold_jobs_in_build = True |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4750 | A = self.fake_gerrit.addFakeChange( |
| 4751 | 'org/project-merge-branches', 'mp', 'A') |
| 4752 | B = self.fake_gerrit.addFakeChange( |
| 4753 | 'org/project-merge-branches', 'mp', 'B') |
| 4754 | C = self.fake_gerrit.addFakeChange( |
| 4755 | 'org/project-merge-branches', 'mp', 'C') |
| 4756 | A.addApproval('code-review', 2) |
| 4757 | B.addApproval('code-review', 2) |
| 4758 | C.addApproval('code-review', 2) |
| 4759 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4760 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 4761 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 4762 | self.waitUntilSettled() |
| 4763 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4764 | self.executor_server.release('.*-merge') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4765 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4766 | self.executor_server.release('.*-merge') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4767 | self.waitUntilSettled() |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4768 | self.executor_server.release('.*-merge') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4769 | self.waitUntilSettled() |
| 4770 | |
| 4771 | build = self.builds[-1] |
| 4772 | self.assertEqual(self.getParameter(build, 'ZUUL_BRANCH'), 'mp') |
| 4773 | ref = self.getParameter(build, 'ZUUL_REF') |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 4774 | path = os.path.join(build.jobdir.src_root, 'review.example.com', |
| 4775 | 'org/project-merge-branches') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4776 | repo = git.Repo(path) |
| 4777 | |
| 4778 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 4779 | repo_messages.reverse() |
| 4780 | correct_messages = [ |
| 4781 | 'initial commit', |
| 4782 | 'add content from fixture', |
| 4783 | 'mp commit', |
| 4784 | 'A-1', 'B-1', 'C-1'] |
| 4785 | self.assertEqual(repo_messages, correct_messages) |
| 4786 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4787 | self.executor_server.hold_jobs_in_build = False |
| 4788 | self.executor_server.release() |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4789 | self.waitUntilSettled() |
| 4790 | |
| 4791 | def test_merge_multi_branch(self): |
| 4792 | "Test that dependent changes on multiple branches are merged" |
| 4793 | self.create_branch('org/project-merge-branches', 'mp') |
| 4794 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4795 | self.executor_server.hold_jobs_in_build = True |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4796 | A = self.fake_gerrit.addFakeChange( |
| 4797 | 'org/project-merge-branches', 'master', 'A') |
| 4798 | B = self.fake_gerrit.addFakeChange( |
| 4799 | 'org/project-merge-branches', 'mp', 'B') |
| 4800 | C = self.fake_gerrit.addFakeChange( |
| 4801 | 'org/project-merge-branches', 'master', 'C') |
| 4802 | A.addApproval('code-review', 2) |
| 4803 | B.addApproval('code-review', 2) |
| 4804 | C.addApproval('code-review', 2) |
| 4805 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4806 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 4807 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 4808 | self.waitUntilSettled() |
| 4809 | |
| 4810 | job_A = None |
| 4811 | for job in self.builds: |
| 4812 | if 'project-merge' in job.name: |
| 4813 | job_A = job |
| 4814 | ref_A = self.getParameter(job_A, 'ZUUL_REF') |
| 4815 | commit_A = self.getParameter(job_A, 'ZUUL_COMMIT') |
| 4816 | self.log.debug("Got Zuul ref for change A: %s" % ref_A) |
| 4817 | self.log.debug("Got Zuul commit for change A: %s" % commit_A) |
| 4818 | |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 4819 | path = os.path.join(job_A.jobdir.src_root, 'review.example.com', |
| 4820 | 'org/project-merge-branches') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4821 | repo = git.Repo(path) |
| 4822 | repo_messages = [c.message.strip() |
| 4823 | for c in repo.iter_commits(ref_A)] |
| 4824 | repo_messages.reverse() |
| 4825 | correct_messages = [ |
| 4826 | 'initial commit', 'add content from fixture', 'A-1'] |
| 4827 | self.assertEqual(repo_messages, correct_messages) |
| 4828 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4829 | self.executor_server.release('.*-merge') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4830 | self.waitUntilSettled() |
| 4831 | |
| 4832 | job_B = None |
| 4833 | for job in self.builds: |
| 4834 | if 'project-merge' in job.name: |
| 4835 | job_B = job |
| 4836 | ref_B = self.getParameter(job_B, 'ZUUL_REF') |
| 4837 | commit_B = self.getParameter(job_B, 'ZUUL_COMMIT') |
| 4838 | self.log.debug("Got Zuul ref for change B: %s" % ref_B) |
| 4839 | self.log.debug("Got Zuul commit for change B: %s" % commit_B) |
| 4840 | |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 4841 | path = os.path.join(job_B.jobdir.src_root, 'review.example.com', |
| 4842 | 'org/project-merge-branches') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4843 | repo = git.Repo(path) |
| 4844 | repo_messages = [c.message.strip() |
| 4845 | for c in repo.iter_commits(ref_B)] |
| 4846 | repo_messages.reverse() |
| 4847 | correct_messages = [ |
| 4848 | 'initial commit', 'add content from fixture', 'mp commit', 'B-1'] |
| 4849 | self.assertEqual(repo_messages, correct_messages) |
| 4850 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4851 | self.executor_server.release('.*-merge') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4852 | self.waitUntilSettled() |
| 4853 | |
| 4854 | job_C = None |
| 4855 | for job in self.builds: |
| 4856 | if 'project-merge' in job.name: |
| 4857 | job_C = job |
| 4858 | ref_C = self.getParameter(job_C, 'ZUUL_REF') |
| 4859 | commit_C = self.getParameter(job_C, 'ZUUL_COMMIT') |
| 4860 | self.log.debug("Got Zuul ref for change C: %s" % ref_C) |
| 4861 | self.log.debug("Got Zuul commit for change C: %s" % commit_C) |
James E. Blair | 2a53567 | 2017-04-27 12:03:15 -0700 | [diff] [blame] | 4862 | path = os.path.join(job_C.jobdir.src_root, 'review.example.com', |
| 4863 | 'org/project-merge-branches') |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4864 | repo = git.Repo(path) |
| 4865 | repo_messages = [c.message.strip() |
| 4866 | for c in repo.iter_commits(ref_C)] |
| 4867 | |
| 4868 | repo_messages.reverse() |
| 4869 | correct_messages = [ |
| 4870 | 'initial commit', 'add content from fixture', |
| 4871 | 'A-1', 'C-1'] |
| 4872 | # Ensure the right commits are in the history for this ref |
| 4873 | self.assertEqual(repo_messages, correct_messages) |
| 4874 | |
Paul Belanger | 174a827 | 2017-03-14 13:20:10 -0400 | [diff] [blame] | 4875 | self.executor_server.hold_jobs_in_build = False |
| 4876 | self.executor_server.release() |
Adam Gandelman | 4da00f6 | 2016-12-09 15:47:33 -0800 | [diff] [blame] | 4877 | self.waitUntilSettled() |
Tobias Henkel | 9a0e194 | 2017-03-20 16:16:02 +0100 | [diff] [blame] | 4878 | |
| 4879 | |
James E. Blair | 9ea0d0b | 2017-04-20 09:27:15 -0700 | [diff] [blame] | 4880 | class TestSemaphore(ZuulTestCase): |
| 4881 | tenant_config_file = 'config/semaphore/main.yaml' |
| 4882 | |
| 4883 | def test_semaphore_one(self): |
| 4884 | "Test semaphores with max=1 (mutex)" |
| 4885 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4886 | |
| 4887 | self.executor_server.hold_jobs_in_build = True |
| 4888 | |
| 4889 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4890 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 4891 | self.assertFalse('test-semaphore' in |
| 4892 | tenant.semaphore_handler.semaphores) |
| 4893 | |
| 4894 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4895 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4896 | self.waitUntilSettled() |
| 4897 | |
| 4898 | self.assertEqual(len(self.builds), 3) |
| 4899 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4900 | self.assertEqual(self.builds[1].name, 'semaphore-one-test1') |
| 4901 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 4902 | |
| 4903 | self.executor_server.release('semaphore-one-test1') |
| 4904 | self.waitUntilSettled() |
| 4905 | |
| 4906 | self.assertEqual(len(self.builds), 3) |
| 4907 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4908 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 4909 | self.assertEqual(self.builds[2].name, 'semaphore-one-test2') |
| 4910 | self.assertTrue('test-semaphore' in |
| 4911 | tenant.semaphore_handler.semaphores) |
| 4912 | |
| 4913 | self.executor_server.release('semaphore-one-test2') |
| 4914 | self.waitUntilSettled() |
| 4915 | |
| 4916 | self.assertEqual(len(self.builds), 3) |
| 4917 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4918 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 4919 | self.assertEqual(self.builds[2].name, 'semaphore-one-test1') |
| 4920 | self.assertTrue('test-semaphore' in |
| 4921 | tenant.semaphore_handler.semaphores) |
| 4922 | |
| 4923 | self.executor_server.release('semaphore-one-test1') |
| 4924 | self.waitUntilSettled() |
| 4925 | |
| 4926 | self.assertEqual(len(self.builds), 3) |
| 4927 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4928 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 4929 | self.assertEqual(self.builds[2].name, 'semaphore-one-test2') |
| 4930 | self.assertTrue('test-semaphore' in |
| 4931 | tenant.semaphore_handler.semaphores) |
| 4932 | |
| 4933 | self.executor_server.release('semaphore-one-test2') |
| 4934 | self.waitUntilSettled() |
| 4935 | |
| 4936 | self.assertEqual(len(self.builds), 2) |
| 4937 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4938 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 4939 | self.assertFalse('test-semaphore' in |
| 4940 | tenant.semaphore_handler.semaphores) |
| 4941 | |
| 4942 | self.executor_server.hold_jobs_in_build = False |
| 4943 | self.executor_server.release() |
| 4944 | |
| 4945 | self.waitUntilSettled() |
| 4946 | self.assertEqual(len(self.builds), 0) |
| 4947 | |
| 4948 | self.assertEqual(A.reported, 1) |
| 4949 | self.assertEqual(B.reported, 1) |
| 4950 | self.assertFalse('test-semaphore' in |
| 4951 | tenant.semaphore_handler.semaphores) |
| 4952 | |
| 4953 | def test_semaphore_two(self): |
| 4954 | "Test semaphores with max>1" |
| 4955 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4956 | |
| 4957 | self.executor_server.hold_jobs_in_build = True |
| 4958 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4959 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 4960 | self.assertFalse('test-semaphore-two' in |
| 4961 | tenant.semaphore_handler.semaphores) |
| 4962 | |
| 4963 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4964 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4965 | self.waitUntilSettled() |
| 4966 | |
| 4967 | self.assertEqual(len(self.builds), 4) |
| 4968 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4969 | self.assertEqual(self.builds[1].name, 'semaphore-two-test1') |
| 4970 | self.assertEqual(self.builds[2].name, 'semaphore-two-test2') |
| 4971 | self.assertEqual(self.builds[3].name, 'project-test1') |
| 4972 | self.assertTrue('test-semaphore-two' in |
| 4973 | tenant.semaphore_handler.semaphores) |
| 4974 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 4975 | 'test-semaphore-two', [])), 2) |
| 4976 | |
| 4977 | self.executor_server.release('semaphore-two-test1') |
| 4978 | self.waitUntilSettled() |
| 4979 | |
| 4980 | self.assertEqual(len(self.builds), 4) |
| 4981 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4982 | self.assertEqual(self.builds[1].name, 'semaphore-two-test2') |
| 4983 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 4984 | self.assertEqual(self.builds[3].name, 'semaphore-two-test1') |
| 4985 | self.assertTrue('test-semaphore-two' in |
| 4986 | tenant.semaphore_handler.semaphores) |
| 4987 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 4988 | 'test-semaphore-two', [])), 2) |
| 4989 | |
| 4990 | self.executor_server.release('semaphore-two-test2') |
| 4991 | self.waitUntilSettled() |
| 4992 | |
| 4993 | self.assertEqual(len(self.builds), 4) |
| 4994 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 4995 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 4996 | self.assertEqual(self.builds[2].name, 'semaphore-two-test1') |
| 4997 | self.assertEqual(self.builds[3].name, 'semaphore-two-test2') |
| 4998 | self.assertTrue('test-semaphore-two' in |
| 4999 | tenant.semaphore_handler.semaphores) |
| 5000 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 5001 | 'test-semaphore-two', [])), 2) |
| 5002 | |
| 5003 | self.executor_server.release('semaphore-two-test1') |
| 5004 | self.waitUntilSettled() |
| 5005 | |
| 5006 | self.assertEqual(len(self.builds), 3) |
| 5007 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 5008 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 5009 | self.assertEqual(self.builds[2].name, 'semaphore-two-test2') |
| 5010 | self.assertTrue('test-semaphore-two' in |
| 5011 | tenant.semaphore_handler.semaphores) |
| 5012 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 5013 | 'test-semaphore-two', [])), 1) |
| 5014 | |
| 5015 | self.executor_server.release('semaphore-two-test2') |
| 5016 | self.waitUntilSettled() |
| 5017 | |
| 5018 | self.assertEqual(len(self.builds), 2) |
| 5019 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 5020 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 5021 | self.assertFalse('test-semaphore-two' in |
| 5022 | tenant.semaphore_handler.semaphores) |
| 5023 | |
| 5024 | self.executor_server.hold_jobs_in_build = False |
| 5025 | self.executor_server.release() |
| 5026 | |
| 5027 | self.waitUntilSettled() |
| 5028 | self.assertEqual(len(self.builds), 0) |
| 5029 | |
| 5030 | self.assertEqual(A.reported, 1) |
| 5031 | self.assertEqual(B.reported, 1) |
| 5032 | |
| 5033 | def test_semaphore_abandon(self): |
| 5034 | "Test abandon with job semaphores" |
| 5035 | self.executor_server.hold_jobs_in_build = True |
| 5036 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5037 | check_pipeline = tenant.layout.pipelines['check'] |
| 5038 | |
| 5039 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 5040 | self.assertFalse('test-semaphore' in |
| 5041 | tenant.semaphore_handler.semaphores) |
| 5042 | |
| 5043 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 5044 | self.waitUntilSettled() |
| 5045 | |
| 5046 | self.assertTrue('test-semaphore' in |
| 5047 | tenant.semaphore_handler.semaphores) |
| 5048 | |
| 5049 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 5050 | self.waitUntilSettled() |
| 5051 | |
| 5052 | # The check pipeline should be empty |
| 5053 | items = check_pipeline.getAllItems() |
| 5054 | self.assertEqual(len(items), 0) |
| 5055 | |
| 5056 | # The semaphore should be released |
| 5057 | self.assertFalse('test-semaphore' in |
| 5058 | tenant.semaphore_handler.semaphores) |
| 5059 | |
| 5060 | self.executor_server.hold_jobs_in_build = False |
| 5061 | self.executor_server.release() |
| 5062 | self.waitUntilSettled() |
| 5063 | |
Tobias Henkel | 0f71400 | 2017-06-30 23:30:52 +0200 | [diff] [blame] | 5064 | def test_semaphore_new_patchset(self): |
| 5065 | "Test new patchset with job semaphores" |
| 5066 | self.executor_server.hold_jobs_in_build = True |
| 5067 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5068 | check_pipeline = tenant.layout.pipelines['check'] |
| 5069 | |
| 5070 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 5071 | self.assertFalse('test-semaphore' in |
| 5072 | tenant.semaphore_handler.semaphores) |
| 5073 | |
| 5074 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 5075 | self.waitUntilSettled() |
| 5076 | |
| 5077 | self.assertTrue('test-semaphore' in |
| 5078 | tenant.semaphore_handler.semaphores) |
| 5079 | semaphore = tenant.semaphore_handler.semaphores['test-semaphore'] |
| 5080 | self.assertEqual(len(semaphore), 1) |
| 5081 | |
| 5082 | A.addPatchset() |
| 5083 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 5084 | self.waitUntilSettled() |
| 5085 | |
| 5086 | self.assertTrue('test-semaphore' in |
| 5087 | tenant.semaphore_handler.semaphores) |
| 5088 | semaphore = tenant.semaphore_handler.semaphores['test-semaphore'] |
| 5089 | self.assertEqual(len(semaphore), 1) |
| 5090 | |
| 5091 | items = check_pipeline.getAllItems() |
| 5092 | self.assertEqual(items[0].change.number, '1') |
| 5093 | self.assertEqual(items[0].change.patchset, '2') |
| 5094 | self.assertTrue(items[0].live) |
| 5095 | |
| 5096 | self.executor_server.hold_jobs_in_build = False |
| 5097 | self.executor_server.release() |
| 5098 | self.waitUntilSettled() |
| 5099 | |
| 5100 | # The semaphore should be released |
| 5101 | self.assertFalse('test-semaphore' in |
| 5102 | tenant.semaphore_handler.semaphores) |
| 5103 | |
James E. Blair | 9ea0d0b | 2017-04-20 09:27:15 -0700 | [diff] [blame] | 5104 | def test_semaphore_reconfigure(self): |
| 5105 | "Test reconfigure with job semaphores" |
| 5106 | self.executor_server.hold_jobs_in_build = True |
| 5107 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5108 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 5109 | self.assertFalse('test-semaphore' in |
| 5110 | tenant.semaphore_handler.semaphores) |
| 5111 | |
| 5112 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 5113 | self.waitUntilSettled() |
| 5114 | |
| 5115 | self.assertTrue('test-semaphore' in |
| 5116 | tenant.semaphore_handler.semaphores) |
| 5117 | |
| 5118 | # reconfigure without layout change |
| 5119 | self.sched.reconfigure(self.config) |
| 5120 | self.waitUntilSettled() |
| 5121 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5122 | |
| 5123 | # semaphore still must be held |
| 5124 | self.assertTrue('test-semaphore' in |
| 5125 | tenant.semaphore_handler.semaphores) |
| 5126 | |
| 5127 | self.commitConfigUpdate( |
| 5128 | 'common-config', |
| 5129 | 'config/semaphore/zuul-reconfiguration.yaml') |
| 5130 | self.sched.reconfigure(self.config) |
| 5131 | self.waitUntilSettled() |
| 5132 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5133 | |
| 5134 | self.executor_server.release('project-test1') |
| 5135 | self.waitUntilSettled() |
| 5136 | |
| 5137 | # There should be no builds anymore |
| 5138 | self.assertEqual(len(self.builds), 0) |
| 5139 | |
| 5140 | # The semaphore should be released |
| 5141 | self.assertFalse('test-semaphore' in |
| 5142 | tenant.semaphore_handler.semaphores) |
| 5143 | |
| 5144 | |
Tobias Henkel | 9a0e194 | 2017-03-20 16:16:02 +0100 | [diff] [blame] | 5145 | class TestSemaphoreMultiTenant(ZuulTestCase): |
| 5146 | tenant_config_file = 'config/multi-tenant-semaphore/main.yaml' |
| 5147 | |
| 5148 | def test_semaphore_tenant_isolation(self): |
| 5149 | "Test semaphores in multiple tenants" |
| 5150 | |
| 5151 | self.waitUntilSettled() |
| 5152 | tenant_one = self.sched.abide.tenants.get('tenant-one') |
| 5153 | tenant_two = self.sched.abide.tenants.get('tenant-two') |
| 5154 | |
| 5155 | self.executor_server.hold_jobs_in_build = True |
| 5156 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 5157 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 5158 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 5159 | D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') |
| 5160 | E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E') |
| 5161 | self.assertFalse('test-semaphore' in |
| 5162 | tenant_one.semaphore_handler.semaphores) |
| 5163 | self.assertFalse('test-semaphore' in |
| 5164 | tenant_two.semaphore_handler.semaphores) |
| 5165 | |
| 5166 | # add patches to project1 of tenant-one |
| 5167 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 5168 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 5169 | self.waitUntilSettled() |
| 5170 | |
| 5171 | # one build of project1-test1 must run |
| 5172 | # semaphore of tenant-one must be acquired once |
| 5173 | # semaphore of tenant-two must not be acquired |
| 5174 | self.assertEqual(len(self.builds), 1) |
| 5175 | self.assertEqual(self.builds[0].name, 'project1-test1') |
| 5176 | self.assertTrue('test-semaphore' in |
| 5177 | tenant_one.semaphore_handler.semaphores) |
| 5178 | self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get( |
| 5179 | 'test-semaphore', [])), 1) |
| 5180 | self.assertFalse('test-semaphore' in |
| 5181 | tenant_two.semaphore_handler.semaphores) |
| 5182 | |
| 5183 | # add patches to project2 of tenant-two |
| 5184 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 5185 | self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1)) |
| 5186 | self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1)) |
| 5187 | self.waitUntilSettled() |
| 5188 | |
| 5189 | # one build of project1-test1 must run |
| 5190 | # two builds of project2-test1 must run |
| 5191 | # semaphore of tenant-one must be acquired once |
| 5192 | # semaphore of tenant-two must be acquired twice |
| 5193 | self.assertEqual(len(self.builds), 3) |
| 5194 | self.assertEqual(self.builds[0].name, 'project1-test1') |
| 5195 | self.assertEqual(self.builds[1].name, 'project2-test1') |
| 5196 | self.assertEqual(self.builds[2].name, 'project2-test1') |
| 5197 | self.assertTrue('test-semaphore' in |
| 5198 | tenant_one.semaphore_handler.semaphores) |
| 5199 | self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get( |
| 5200 | 'test-semaphore', [])), 1) |
| 5201 | self.assertTrue('test-semaphore' in |
| 5202 | tenant_two.semaphore_handler.semaphores) |
| 5203 | self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get( |
| 5204 | 'test-semaphore', [])), 2) |
| 5205 | |
| 5206 | self.executor_server.release('project1-test1') |
| 5207 | self.waitUntilSettled() |
| 5208 | |
| 5209 | # one build of project1-test1 must run |
| 5210 | # two builds of project2-test1 must run |
| 5211 | # semaphore of tenant-one must be acquired once |
| 5212 | # semaphore of tenant-two must be acquired twice |
| 5213 | self.assertEqual(len(self.builds), 3) |
| 5214 | self.assertEqual(self.builds[0].name, 'project2-test1') |
| 5215 | self.assertEqual(self.builds[1].name, 'project2-test1') |
| 5216 | self.assertEqual(self.builds[2].name, 'project1-test1') |
| 5217 | self.assertTrue('test-semaphore' in |
| 5218 | tenant_one.semaphore_handler.semaphores) |
| 5219 | self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get( |
| 5220 | 'test-semaphore', [])), 1) |
| 5221 | self.assertTrue('test-semaphore' in |
| 5222 | tenant_two.semaphore_handler.semaphores) |
| 5223 | self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get( |
| 5224 | 'test-semaphore', [])), 2) |
| 5225 | |
| 5226 | self.executor_server.release('project2-test1') |
| 5227 | self.waitUntilSettled() |
| 5228 | |
| 5229 | # one build of project1-test1 must run |
| 5230 | # one build of project2-test1 must run |
| 5231 | # semaphore of tenant-one must be acquired once |
| 5232 | # semaphore of tenant-two must be acquired once |
| 5233 | self.assertEqual(len(self.builds), 2) |
| 5234 | self.assertTrue('test-semaphore' in |
| 5235 | tenant_one.semaphore_handler.semaphores) |
| 5236 | self.assertEqual(len(tenant_one.semaphore_handler.semaphores.get( |
| 5237 | 'test-semaphore', [])), 1) |
| 5238 | self.assertTrue('test-semaphore' in |
| 5239 | tenant_two.semaphore_handler.semaphores) |
| 5240 | self.assertEqual(len(tenant_two.semaphore_handler.semaphores.get( |
| 5241 | 'test-semaphore', [])), 1) |
| 5242 | |
| 5243 | self.executor_server.hold_jobs_in_build = False |
| 5244 | self.executor_server.release() |
| 5245 | |
| 5246 | self.waitUntilSettled() |
| 5247 | |
| 5248 | # no build must run |
| 5249 | # semaphore of tenant-one must not be acquired |
| 5250 | # semaphore of tenant-two must not be acquired |
| 5251 | self.assertEqual(len(self.builds), 0) |
| 5252 | self.assertFalse('test-semaphore' in |
| 5253 | tenant_one.semaphore_handler.semaphores) |
| 5254 | self.assertFalse('test-semaphore' in |
| 5255 | tenant_two.semaphore_handler.semaphores) |
| 5256 | |
| 5257 | self.assertEqual(A.reported, 1) |
| 5258 | self.assertEqual(B.reported, 1) |
| 5259 | |
| 5260 | |
| 5261 | class TestSemaphoreInRepo(ZuulTestCase): |
| 5262 | tenant_config_file = 'config/in-repo/main.yaml' |
| 5263 | |
| 5264 | def test_semaphore_in_repo(self): |
| 5265 | "Test semaphores in repo config" |
| 5266 | |
| 5267 | # This tests dynamic semaphore handling in project repos. The semaphore |
| 5268 | # max value should not be evaluated dynamically but must be updated |
| 5269 | # after the change lands. |
| 5270 | |
| 5271 | self.waitUntilSettled() |
| 5272 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5273 | |
| 5274 | in_repo_conf = textwrap.dedent( |
| 5275 | """ |
| 5276 | - job: |
| 5277 | name: project-test2 |
| 5278 | semaphore: test-semaphore |
| 5279 | |
| 5280 | - project: |
| 5281 | name: org/project |
| 5282 | tenant-one-gate: |
| 5283 | jobs: |
| 5284 | - project-test2 |
| 5285 | |
| 5286 | # the max value in dynamic layout must be ignored |
| 5287 | - semaphore: |
| 5288 | name: test-semaphore |
| 5289 | max: 2 |
| 5290 | """) |
| 5291 | |
| 5292 | in_repo_playbook = textwrap.dedent( |
| 5293 | """ |
| 5294 | - hosts: all |
| 5295 | tasks: [] |
| 5296 | """) |
| 5297 | |
| 5298 | file_dict = {'.zuul.yaml': in_repo_conf, |
| 5299 | 'playbooks/project-test2.yaml': in_repo_playbook} |
| 5300 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A', |
| 5301 | files=file_dict) |
| 5302 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 5303 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 5304 | B.setDependsOn(A, 1) |
| 5305 | C.setDependsOn(A, 1) |
| 5306 | |
| 5307 | self.executor_server.hold_jobs_in_build = True |
| 5308 | |
| 5309 | A.addApproval('code-review', 2) |
| 5310 | B.addApproval('code-review', 2) |
| 5311 | C.addApproval('code-review', 2) |
| 5312 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 5313 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 5314 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 5315 | self.waitUntilSettled() |
| 5316 | |
| 5317 | # check that the layout in a queue item still has max value of 1 |
| 5318 | # for test-semaphore |
| 5319 | pipeline = tenant.layout.pipelines.get('tenant-one-gate') |
| 5320 | queue = None |
| 5321 | for queue_candidate in pipeline.queues: |
| 5322 | if queue_candidate.name == 'org/project': |
| 5323 | queue = queue_candidate |
| 5324 | break |
| 5325 | queue_item = queue.queue[0] |
| 5326 | item_dynamic_layout = queue_item.current_build_set.layout |
| 5327 | dynamic_test_semaphore = \ |
| 5328 | item_dynamic_layout.semaphores.get('test-semaphore') |
| 5329 | self.assertEqual(dynamic_test_semaphore.max, 1) |
| 5330 | |
| 5331 | # one build must be in queue, one semaphores acquired |
| 5332 | self.assertEqual(len(self.builds), 1) |
| 5333 | self.assertEqual(self.builds[0].name, 'project-test2') |
| 5334 | self.assertTrue('test-semaphore' in |
| 5335 | tenant.semaphore_handler.semaphores) |
| 5336 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 5337 | 'test-semaphore', [])), 1) |
| 5338 | |
| 5339 | self.executor_server.release('project-test2') |
| 5340 | self.waitUntilSettled() |
| 5341 | |
| 5342 | # change A must be merged |
| 5343 | self.assertEqual(A.data['status'], 'MERGED') |
| 5344 | self.assertEqual(A.reported, 2) |
| 5345 | |
| 5346 | # send change-merged event as the gerrit mock doesn't send it |
| 5347 | self.fake_gerrit.addEvent(A.getChangeMergedEvent()) |
| 5348 | self.waitUntilSettled() |
| 5349 | |
| 5350 | # now that change A was merged, the new semaphore max must be effective |
| 5351 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 5352 | self.assertEqual(tenant.layout.semaphores.get('test-semaphore').max, 2) |
| 5353 | |
| 5354 | # two builds must be in queue, two semaphores acquired |
| 5355 | self.assertEqual(len(self.builds), 2) |
| 5356 | self.assertEqual(self.builds[0].name, 'project-test2') |
| 5357 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 5358 | self.assertTrue('test-semaphore' in |
| 5359 | tenant.semaphore_handler.semaphores) |
| 5360 | self.assertEqual(len(tenant.semaphore_handler.semaphores.get( |
| 5361 | 'test-semaphore', [])), 2) |
| 5362 | |
| 5363 | self.executor_server.release('project-test2') |
| 5364 | self.waitUntilSettled() |
| 5365 | |
| 5366 | self.assertEqual(len(self.builds), 0) |
| 5367 | self.assertFalse('test-semaphore' in |
| 5368 | tenant.semaphore_handler.semaphores) |
| 5369 | |
| 5370 | self.executor_server.hold_jobs_in_build = False |
| 5371 | self.executor_server.release() |
| 5372 | |
| 5373 | self.waitUntilSettled() |
| 5374 | self.assertEqual(len(self.builds), 0) |
| 5375 | |
| 5376 | self.assertEqual(A.reported, 2) |
| 5377 | self.assertEqual(B.reported, 2) |
| 5378 | self.assertEqual(C.reported, 2) |