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 | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 17 | import json |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 18 | import logging |
| 19 | import os |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 20 | import re |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 21 | import shutil |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 22 | import time |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 23 | from unittest import skip |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 24 | |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 25 | import git |
Morgan Fainberg | 293f7f8 | 2016-05-30 14:01:22 -0700 | [diff] [blame] | 26 | from six.moves import urllib |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 27 | import testtools |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 28 | |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 29 | import zuul.change_matcher |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 30 | import zuul.scheduler |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 31 | import zuul.rpcclient |
Joshua Hesketh | 1879cf7 | 2013-08-19 14:13:15 +1000 | [diff] [blame] | 32 | import zuul.reporter.gerrit |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 33 | import zuul.reporter.smtp |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 34 | import zuul.model |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 35 | |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 36 | from tests.base import ( |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 37 | ZuulTestCase, |
| 38 | repack_repo, |
| 39 | ) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 40 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 41 | logging.basicConfig(level=logging.DEBUG, |
| 42 | format='%(asctime)s %(name)-32s ' |
| 43 | '%(levelname)-8s %(message)s') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 44 | |
| 45 | |
Clark Boylan | b640e05 | 2014-04-03 16:41:46 -0700 | [diff] [blame] | 46 | class TestScheduler(ZuulTestCase): |
James E. Blair | 552b54f | 2016-07-22 13:55:32 -0700 | [diff] [blame] | 47 | tenant_config_file = 'config/single-tenant/main.yaml' |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 48 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 49 | def test_jobs_launched(self): |
| 50 | "Test that jobs are launched and a change is merged" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 51 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 52 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 53 | A.addApproval('code-review', 2) |
| 54 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 55 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 56 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 57 | 'SUCCESS') |
| 58 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 59 | 'SUCCESS') |
| 60 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 61 | 'SUCCESS') |
| 62 | self.assertEqual(A.data['status'], 'MERGED') |
| 63 | self.assertEqual(A.reported, 2) |
James E. Blair | 34776ee | 2016-08-25 13:53:54 -0700 | [diff] [blame] | 64 | self.assertEqual(self.getJobFromHistory('project-test1').node, |
| 65 | 'image1') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 66 | |
James E. Blair | 552b54f | 2016-07-22 13:55:32 -0700 | [diff] [blame] | 67 | # TODOv3(jeblair): we may want to report stats by tenant (also?). |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 68 | self.assertReportedStat('gerrit.event.comment-added', value='1|c') |
| 69 | self.assertReportedStat('zuul.pipeline.gate.current_changes', |
| 70 | value='1|g') |
| 71 | self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS', |
| 72 | kind='ms') |
| 73 | self.assertReportedStat('zuul.pipeline.gate.job.project-merge.SUCCESS', |
| 74 | value='1|c') |
| 75 | self.assertReportedStat('zuul.pipeline.gate.resident_time', kind='ms') |
| 76 | self.assertReportedStat('zuul.pipeline.gate.total_changes', |
| 77 | value='1|c') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 78 | self.assertReportedStat( |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 79 | 'zuul.pipeline.gate.org.project.resident_time', kind='ms') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 80 | self.assertReportedStat( |
James E. Blair | 66eeebf | 2013-07-27 17:44:32 -0700 | [diff] [blame] | 81 | 'zuul.pipeline.gate.org.project.total_changes', value='1|c') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 82 | |
James E. Blair | 5821bd9 | 2015-09-16 08:48:15 -0700 | [diff] [blame] | 83 | for build in self.builds: |
| 84 | self.assertEqual(build.parameters['ZUUL_VOTING'], '1') |
| 85 | |
James E. Blair | 3cb1070 | 2013-08-24 08:56:03 -0700 | [diff] [blame] | 86 | def test_initial_pipeline_gauges(self): |
| 87 | "Test that each pipeline reported its length on start" |
James E. Blair | 7da51b7 | 2016-07-25 15:29:43 -0700 | [diff] [blame] | 88 | self.assertReportedStat('zuul.pipeline.gate.current_changes', |
| 89 | value='0|g') |
| 90 | self.assertReportedStat('zuul.pipeline.check.current_changes', |
| 91 | value='0|g') |
James E. Blair | 3cb1070 | 2013-08-24 08:56:03 -0700 | [diff] [blame] | 92 | |
James E. Blair | 34776ee | 2016-08-25 13:53:54 -0700 | [diff] [blame] | 93 | def test_job_branch(self): |
| 94 | "Test the correct variant of a job runs on a branch" |
| 95 | self.create_branch('org/project', 'stable') |
| 96 | A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A') |
| 97 | A.addApproval('code-review', 2) |
| 98 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 99 | self.waitUntilSettled() |
| 100 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 101 | 'SUCCESS') |
| 102 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 103 | 'SUCCESS') |
| 104 | self.assertEqual(A.data['status'], 'MERGED') |
| 105 | self.assertEqual(A.reported, 2, |
| 106 | "A should report start and success") |
| 107 | self.assertIn('gate', A.messages[1], |
| 108 | "A should transit gate") |
| 109 | self.assertEqual(self.getJobFromHistory('project-test1').node, |
| 110 | 'image2') |
| 111 | |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 112 | def test_parallel_changes(self): |
| 113 | "Test that changes are tested in parallel and merged in series" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 114 | |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 115 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 116 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 117 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 118 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 119 | A.addApproval('code-review', 2) |
| 120 | B.addApproval('code-review', 2) |
| 121 | C.addApproval('code-review', 2) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 122 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 123 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 124 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 125 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 126 | |
| 127 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 128 | self.assertEqual(len(self.builds), 1) |
| 129 | self.assertEqual(self.builds[0].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 130 | self.assertTrue(self.builds[0].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 131 | |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 132 | self.launch_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 133 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 134 | self.assertEqual(len(self.builds), 3) |
| 135 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 136 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 137 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 138 | self.assertTrue(self.builds[1].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 139 | self.assertEqual(self.builds[2].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 140 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 141 | |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 142 | self.launch_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 143 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 144 | self.assertEqual(len(self.builds), 5) |
| 145 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 146 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 147 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 148 | self.assertTrue(self.builds[1].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 149 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 150 | self.assertEqual(self.builds[2].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 151 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 152 | self.assertEqual(self.builds[3].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 153 | self.assertTrue(self.builds[3].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 154 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 155 | self.assertEqual(self.builds[4].name, 'project-merge') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 156 | self.assertTrue(self.builds[4].hasChanges(A, B, C)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 157 | |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 158 | self.launch_server.release('.*-merge') |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 159 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 160 | self.assertEqual(len(self.builds), 6) |
| 161 | self.assertEqual(self.builds[0].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 162 | self.assertTrue(self.builds[0].hasChanges(A)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 163 | self.assertEqual(self.builds[1].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 164 | self.assertTrue(self.builds[1].hasChanges(A)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 165 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 166 | self.assertEqual(self.builds[2].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 167 | self.assertTrue(self.builds[2].hasChanges(A, B)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 168 | self.assertEqual(self.builds[3].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 169 | self.assertTrue(self.builds[3].hasChanges(A, B)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 170 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 171 | self.assertEqual(self.builds[4].name, 'project-test1') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 172 | self.assertTrue(self.builds[4].hasChanges(A, B, C)) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 173 | self.assertEqual(self.builds[5].name, 'project-test2') |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 174 | self.assertTrue(self.builds[5].hasChanges(A, B, C)) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 175 | |
James E. Blair | 791b539 | 2016-08-03 11:25:56 -0700 | [diff] [blame] | 176 | self.launch_server.hold_jobs_in_build = False |
| 177 | self.launch_server.release() |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 178 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 179 | self.assertEqual(len(self.builds), 0) |
James E. Blair | b0fcae4 | 2012-07-17 11:12:10 -0700 | [diff] [blame] | 180 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 181 | self.assertEqual(len(self.history), 9) |
| 182 | self.assertEqual(A.data['status'], 'MERGED') |
| 183 | self.assertEqual(B.data['status'], 'MERGED') |
| 184 | self.assertEqual(C.data['status'], 'MERGED') |
| 185 | self.assertEqual(A.reported, 2) |
| 186 | self.assertEqual(B.reported, 2) |
| 187 | self.assertEqual(C.reported, 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 188 | |
| 189 | def test_failed_changes(self): |
| 190 | "Test that a change behind a failed change is retested" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 191 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 192 | |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 193 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 194 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 195 | A.addApproval('code-review', 2) |
| 196 | B.addApproval('code-review', 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 197 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 198 | self.launch_server.failJob('project-test1', A) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 199 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 200 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 201 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 202 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 203 | self.assertBuilds([dict(name='project-merge', changes='1,1')]) |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 204 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 205 | self.launch_server.release('.*-merge') |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 206 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 207 | # A/project-merge is complete |
| 208 | self.assertBuilds([ |
| 209 | dict(name='project-test1', changes='1,1'), |
| 210 | dict(name='project-test2', changes='1,1'), |
| 211 | dict(name='project-merge', changes='1,1 2,1'), |
| 212 | ]) |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 213 | |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 214 | self.launch_server.release('.*-merge') |
James E. Blair | e281901 | 2013-06-28 17:17:26 -0400 | [diff] [blame] | 215 | self.waitUntilSettled() |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 216 | # A/project-merge is complete |
| 217 | # B/project-merge is complete |
| 218 | self.assertBuilds([ |
| 219 | dict(name='project-test1', changes='1,1'), |
| 220 | dict(name='project-test2', changes='1,1'), |
| 221 | dict(name='project-test1', changes='1,1 2,1'), |
| 222 | dict(name='project-test2', changes='1,1 2,1'), |
| 223 | ]) |
| 224 | |
| 225 | # Release project-test1 for A which will fail. This will |
| 226 | # abort both running B jobs and relaunch project-merge for B. |
| 227 | self.builds[0].release() |
| 228 | self.waitUntilSettled() |
| 229 | |
| 230 | self.orderedRelease() |
| 231 | self.assertHistory([ |
| 232 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 233 | dict(name='project-merge', result='SUCCESS', changes='1,1 2,1'), |
| 234 | dict(name='project-test1', result='FAILURE', changes='1,1'), |
| 235 | dict(name='project-test1', result='ABORTED', changes='1,1 2,1'), |
| 236 | dict(name='project-test2', result='ABORTED', changes='1,1 2,1'), |
| 237 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 238 | dict(name='project-merge', result='SUCCESS', changes='2,1'), |
| 239 | dict(name='project-test1', result='SUCCESS', changes='2,1'), |
| 240 | dict(name='project-test2', result='SUCCESS', changes='2,1'), |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 241 | ], ordered=False) |
James E. Blair | 2b2a8ab | 2016-08-11 14:39:11 -0700 | [diff] [blame] | 242 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 243 | self.assertEqual(A.data['status'], 'NEW') |
| 244 | self.assertEqual(B.data['status'], 'MERGED') |
| 245 | self.assertEqual(A.reported, 2) |
| 246 | self.assertEqual(B.reported, 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 247 | |
| 248 | def test_independent_queues(self): |
| 249 | "Test that changes end up in the right queues" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 250 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 251 | self.launch_server.hold_jobs_in_build = True |
Zhongyue Luo | 5d55607 | 2012-09-21 02:00:47 +0900 | [diff] [blame] | 252 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 253 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 254 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 255 | A.addApproval('code-review', 2) |
| 256 | B.addApproval('code-review', 2) |
| 257 | C.addApproval('code-review', 2) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 258 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 259 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 260 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 261 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 262 | |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 263 | self.waitUntilSettled() |
| 264 | |
| 265 | # 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] | 266 | self.assertBuilds([ |
| 267 | dict(name='project-merge', changes='1,1'), |
| 268 | dict(name='project-merge', changes='2,1'), |
| 269 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 270 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 271 | # Release the current merge builds |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 272 | self.builds[0].release() |
| 273 | self.waitUntilSettled() |
| 274 | self.builds[0].release() |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 275 | self.waitUntilSettled() |
| 276 | # Release the merge job for project2 which is behind project1 |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 277 | self.launch_server.release('.*-merge') |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 278 | self.waitUntilSettled() |
| 279 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 280 | # All the test builds should be running: |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 281 | self.assertBuilds([ |
| 282 | dict(name='project-test1', changes='1,1'), |
| 283 | dict(name='project-test2', changes='1,1'), |
| 284 | dict(name='project-test1', changes='2,1'), |
| 285 | dict(name='project-test2', changes='2,1'), |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 286 | dict(name='project1-project2-integration', changes='2,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 287 | dict(name='project-test1', changes='2,1 3,1'), |
| 288 | dict(name='project-test2', changes='2,1 3,1'), |
| 289 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 290 | |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 291 | self.orderedRelease() |
| 292 | self.assertHistory([ |
| 293 | dict(name='project-merge', result='SUCCESS', changes='1,1'), |
| 294 | dict(name='project-merge', result='SUCCESS', changes='2,1'), |
| 295 | dict(name='project-merge', result='SUCCESS', changes='2,1 3,1'), |
| 296 | dict(name='project-test1', result='SUCCESS', changes='1,1'), |
| 297 | dict(name='project-test2', result='SUCCESS', changes='1,1'), |
| 298 | dict(name='project-test1', result='SUCCESS', changes='2,1'), |
| 299 | dict(name='project-test2', result='SUCCESS', changes='2,1'), |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 300 | dict( |
| 301 | name='project1-project2-integration', |
| 302 | result='SUCCESS', |
| 303 | changes='2,1'), |
James E. Blair | 5f0d49e | 2016-08-19 09:36:50 -0700 | [diff] [blame] | 304 | dict(name='project-test1', result='SUCCESS', changes='2,1 3,1'), |
| 305 | dict(name='project-test2', result='SUCCESS', changes='2,1 3,1'), |
| 306 | ]) |
James E. Blair | b02a3bb | 2012-07-30 17:49:55 -0700 | [diff] [blame] | 307 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 308 | self.assertEqual(A.data['status'], 'MERGED') |
| 309 | self.assertEqual(B.data['status'], 'MERGED') |
| 310 | self.assertEqual(C.data['status'], 'MERGED') |
| 311 | self.assertEqual(A.reported, 2) |
| 312 | self.assertEqual(B.reported, 2) |
| 313 | self.assertEqual(C.reported, 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 314 | |
| 315 | def test_failed_change_at_head(self): |
| 316 | "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] | 317 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 318 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 319 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 320 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 321 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 322 | A.addApproval('code-review', 2) |
| 323 | B.addApproval('code-review', 2) |
| 324 | C.addApproval('code-review', 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 325 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 326 | self.launch_server.failJob('project-test1', A) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 327 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 328 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 329 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 330 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 331 | |
| 332 | self.waitUntilSettled() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 333 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 334 | self.assertBuilds([ |
| 335 | dict(name='project-merge', changes='1,1'), |
| 336 | ]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 337 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 338 | self.launch_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 339 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 340 | self.launch_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 341 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 342 | self.launch_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 343 | self.waitUntilSettled() |
| 344 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 345 | self.assertBuilds([ |
| 346 | dict(name='project-test1', changes='1,1'), |
| 347 | dict(name='project-test2', changes='1,1'), |
| 348 | dict(name='project-test1', changes='1,1 2,1'), |
| 349 | dict(name='project-test2', changes='1,1 2,1'), |
| 350 | dict(name='project-test1', changes='1,1 2,1 3,1'), |
| 351 | dict(name='project-test2', changes='1,1 2,1 3,1'), |
| 352 | ]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 353 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 354 | self.release(self.builds[0]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 355 | self.waitUntilSettled() |
| 356 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 357 | # project-test2, project-merge for B |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 358 | self.assertBuilds([ |
| 359 | dict(name='project-test2', changes='1,1'), |
| 360 | dict(name='project-merge', changes='2,1'), |
| 361 | ]) |
| 362 | # Unordered history comparison because the aborts can finish |
| 363 | # in any order. |
| 364 | self.assertHistory([ |
| 365 | dict(name='project-merge', result='SUCCESS', |
| 366 | changes='1,1'), |
| 367 | dict(name='project-merge', result='SUCCESS', |
| 368 | changes='1,1 2,1'), |
| 369 | dict(name='project-merge', result='SUCCESS', |
| 370 | changes='1,1 2,1 3,1'), |
| 371 | dict(name='project-test1', result='FAILURE', |
| 372 | changes='1,1'), |
| 373 | dict(name='project-test1', result='ABORTED', |
| 374 | changes='1,1 2,1'), |
| 375 | dict(name='project-test2', result='ABORTED', |
| 376 | changes='1,1 2,1'), |
| 377 | dict(name='project-test1', result='ABORTED', |
| 378 | changes='1,1 2,1 3,1'), |
| 379 | dict(name='project-test2', result='ABORTED', |
| 380 | changes='1,1 2,1 3,1'), |
| 381 | ], ordered=False) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 382 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 383 | self.launch_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 384 | self.waitUntilSettled() |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 385 | self.launch_server.release('.*-merge') |
| 386 | self.waitUntilSettled() |
| 387 | self.orderedRelease() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 388 | |
James E. Blair | b536ecc | 2016-08-31 10:11:42 -0700 | [diff] [blame] | 389 | self.assertBuilds([]) |
| 390 | self.assertHistory([ |
| 391 | dict(name='project-merge', result='SUCCESS', |
| 392 | changes='1,1'), |
| 393 | dict(name='project-merge', result='SUCCESS', |
| 394 | changes='1,1 2,1'), |
| 395 | dict(name='project-merge', result='SUCCESS', |
| 396 | changes='1,1 2,1 3,1'), |
| 397 | dict(name='project-test1', result='FAILURE', |
| 398 | changes='1,1'), |
| 399 | dict(name='project-test1', result='ABORTED', |
| 400 | changes='1,1 2,1'), |
| 401 | dict(name='project-test2', result='ABORTED', |
| 402 | changes='1,1 2,1'), |
| 403 | dict(name='project-test1', result='ABORTED', |
| 404 | changes='1,1 2,1 3,1'), |
| 405 | dict(name='project-test2', result='ABORTED', |
| 406 | changes='1,1 2,1 3,1'), |
| 407 | dict(name='project-merge', result='SUCCESS', |
| 408 | changes='2,1'), |
| 409 | dict(name='project-merge', result='SUCCESS', |
| 410 | changes='2,1 3,1'), |
| 411 | dict(name='project-test2', result='SUCCESS', |
| 412 | changes='1,1'), |
| 413 | dict(name='project-test1', result='SUCCESS', |
| 414 | changes='2,1'), |
| 415 | dict(name='project-test2', result='SUCCESS', |
| 416 | changes='2,1'), |
| 417 | dict(name='project-test1', result='SUCCESS', |
| 418 | changes='2,1 3,1'), |
| 419 | dict(name='project-test2', result='SUCCESS', |
| 420 | changes='2,1 3,1'), |
| 421 | ], ordered=False) |
| 422 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 423 | self.assertEqual(A.data['status'], 'NEW') |
| 424 | self.assertEqual(B.data['status'], 'MERGED') |
| 425 | self.assertEqual(C.data['status'], 'MERGED') |
| 426 | self.assertEqual(A.reported, 2) |
| 427 | self.assertEqual(B.reported, 2) |
| 428 | self.assertEqual(C.reported, 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 429 | |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 430 | def test_failed_change_in_middle(self): |
| 431 | "Test a failed change in the middle of the queue" |
| 432 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 433 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 434 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 435 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 436 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 437 | A.addApproval('code-review', 2) |
| 438 | B.addApproval('code-review', 2) |
| 439 | C.addApproval('code-review', 2) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 440 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 441 | self.launch_server.failJob('project-test1', B) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 442 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 443 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 444 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 445 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 446 | |
| 447 | self.waitUntilSettled() |
| 448 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 449 | self.launch_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 450 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 451 | self.launch_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 452 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 453 | self.launch_server.release('.*-merge') |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 454 | self.waitUntilSettled() |
| 455 | |
| 456 | self.assertEqual(len(self.builds), 6) |
| 457 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 458 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 459 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 460 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 461 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 462 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 463 | |
| 464 | self.release(self.builds[2]) |
| 465 | self.waitUntilSettled() |
| 466 | |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 467 | # project-test1 and project-test2 for A |
| 468 | # project-test2 for B |
| 469 | # project-merge for C (without B) |
| 470 | self.assertEqual(len(self.builds), 4) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 471 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 2) |
| 472 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 473 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 474 | self.waitUntilSettled() |
| 475 | |
| 476 | # project-test1 and project-test2 for A |
| 477 | # project-test2 for B |
| 478 | # project-test1 and project-test2 for C |
| 479 | self.assertEqual(len(self.builds), 5) |
| 480 | |
Paul Belanger | 2e2a049 | 2016-10-30 18:33:37 -0400 | [diff] [blame] | 481 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 482 | items = tenant.layout.pipelines['gate'].getAllItems() |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 483 | builds = items[0].current_build_set.getBuilds() |
| 484 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
| 485 | self.assertEqual(self.countJobResults(builds, None), 2) |
| 486 | builds = items[1].current_build_set.getBuilds() |
| 487 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
| 488 | self.assertEqual(self.countJobResults(builds, 'FAILURE'), 1) |
| 489 | self.assertEqual(self.countJobResults(builds, None), 1) |
| 490 | builds = items[2].current_build_set.getBuilds() |
| 491 | self.assertEqual(self.countJobResults(builds, 'SUCCESS'), 1) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 492 | self.assertEqual(self.countJobResults(builds, None), 2) |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 493 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 494 | self.launch_server.hold_jobs_in_build = False |
| 495 | self.launch_server.release() |
James E. Blair | 0aac487 | 2013-08-23 14:02:38 -0700 | [diff] [blame] | 496 | self.waitUntilSettled() |
| 497 | |
| 498 | self.assertEqual(len(self.builds), 0) |
| 499 | self.assertEqual(len(self.history), 12) |
| 500 | self.assertEqual(A.data['status'], 'MERGED') |
| 501 | self.assertEqual(B.data['status'], 'NEW') |
| 502 | self.assertEqual(C.data['status'], 'MERGED') |
| 503 | self.assertEqual(A.reported, 2) |
| 504 | self.assertEqual(B.reported, 2) |
| 505 | self.assertEqual(C.reported, 2) |
| 506 | |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 507 | def test_failed_change_at_head_with_queue(self): |
| 508 | "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] | 509 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 510 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 511 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 512 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 513 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 514 | A.addApproval('code-review', 2) |
| 515 | B.addApproval('code-review', 2) |
| 516 | C.addApproval('code-review', 2) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 517 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 518 | self.launch_server.failJob('project-test1', A) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 519 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 520 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 521 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 522 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 523 | |
| 524 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 525 | queue = self.gearman_server.getQueue() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 526 | self.assertEqual(len(self.builds), 0) |
| 527 | self.assertEqual(len(queue), 1) |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 528 | self.assertEqual(queue[0].name, 'launcher:launch') |
| 529 | job_args = json.loads(queue[0].arguments) |
| 530 | self.assertEqual(job_args['job'], 'project-merge') |
| 531 | self.assertEqual(job_args['items'][0]['number'], '%d' % A.number) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 532 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 533 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 534 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 535 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 536 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 537 | self.gearman_server.release('.*-merge') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 538 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 539 | queue = self.gearman_server.getQueue() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 540 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 541 | self.assertEqual(len(self.builds), 0) |
| 542 | self.assertEqual(len(queue), 6) |
Clint Byrum | 8b2bc0c | 2016-11-16 16:28:50 -0800 | [diff] [blame] | 543 | |
| 544 | self.assertEqual( |
| 545 | json.loads(queue[0].arguments)['job'], 'project-test1') |
| 546 | self.assertEqual( |
| 547 | json.loads(queue[1].arguments)['job'], 'project-test2') |
| 548 | self.assertEqual( |
| 549 | json.loads(queue[2].arguments)['job'], 'project-test1') |
| 550 | self.assertEqual( |
| 551 | json.loads(queue[3].arguments)['job'], 'project-test2') |
| 552 | self.assertEqual( |
| 553 | json.loads(queue[4].arguments)['job'], 'project-test1') |
| 554 | self.assertEqual( |
| 555 | json.loads(queue[5].arguments)['job'], 'project-test2') |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 556 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 557 | self.release(queue[0]) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 558 | self.waitUntilSettled() |
| 559 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 560 | self.assertEqual(len(self.builds), 0) |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 561 | queue = self.gearman_server.getQueue() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 562 | self.assertEqual(len(queue), 2) # project-test2, project-merge for B |
| 563 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 0) |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 564 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 565 | self.gearman_server.hold_jobs_in_queue = False |
| 566 | self.gearman_server.release() |
James E. Blair | d466dc4 | 2012-07-31 10:42:56 -0700 | [diff] [blame] | 567 | self.waitUntilSettled() |
| 568 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 569 | self.assertEqual(len(self.builds), 0) |
| 570 | self.assertEqual(len(self.history), 11) |
| 571 | self.assertEqual(A.data['status'], 'NEW') |
| 572 | self.assertEqual(B.data['status'], 'MERGED') |
| 573 | self.assertEqual(C.data['status'], 'MERGED') |
| 574 | self.assertEqual(A.reported, 2) |
| 575 | self.assertEqual(B.reported, 2) |
| 576 | self.assertEqual(C.reported, 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 577 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 578 | @skip("Disabled for early v3 development") |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 579 | def _test_time_database(self, iteration): |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 580 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 581 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 582 | A.addApproval('code-review', 2) |
| 583 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 584 | self.waitUntilSettled() |
| 585 | time.sleep(2) |
| 586 | |
| 587 | data = json.loads(self.sched.formatStatusJSON()) |
| 588 | found_job = None |
| 589 | for pipeline in data['pipelines']: |
| 590 | if pipeline['name'] != 'gate': |
| 591 | continue |
| 592 | for queue in pipeline['change_queues']: |
| 593 | for head in queue['heads']: |
| 594 | for item in head: |
| 595 | for job in item['jobs']: |
| 596 | if job['name'] == 'project-merge': |
| 597 | found_job = job |
| 598 | break |
| 599 | |
| 600 | self.assertIsNotNone(found_job) |
| 601 | if iteration == 1: |
| 602 | self.assertIsNotNone(found_job['estimated_time']) |
| 603 | self.assertIsNone(found_job['remaining_time']) |
| 604 | else: |
| 605 | self.assertIsNotNone(found_job['estimated_time']) |
| 606 | self.assertTrue(found_job['estimated_time'] >= 2) |
| 607 | self.assertIsNotNone(found_job['remaining_time']) |
| 608 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 609 | self.launch_server.hold_jobs_in_build = False |
| 610 | self.launch_server.release() |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 611 | self.waitUntilSettled() |
| 612 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 613 | @skip("Disabled for early v3 development") |
James E. Blair | ce8a213 | 2016-05-19 15:21:52 -0700 | [diff] [blame] | 614 | def test_time_database(self): |
| 615 | "Test the time database" |
| 616 | |
| 617 | self._test_time_database(1) |
| 618 | self._test_time_database(2) |
| 619 | |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 620 | def test_two_failed_changes_at_head(self): |
| 621 | "Test that changes are reparented correctly if 2 fail at head" |
| 622 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 623 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 624 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 625 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 626 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 627 | A.addApproval('code-review', 2) |
| 628 | B.addApproval('code-review', 2) |
| 629 | C.addApproval('code-review', 2) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 630 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 631 | self.launch_server.failJob('project-test1', A) |
| 632 | self.launch_server.failJob('project-test1', B) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 633 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 634 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 635 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 636 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 637 | self.waitUntilSettled() |
| 638 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 639 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 640 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 641 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 642 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 643 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 644 | self.waitUntilSettled() |
| 645 | |
| 646 | self.assertEqual(len(self.builds), 6) |
| 647 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 648 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 649 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 650 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 651 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 652 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 653 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 654 | self.assertTrue(self.builds[0].hasChanges(A)) |
| 655 | self.assertTrue(self.builds[2].hasChanges(A)) |
| 656 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 657 | self.assertTrue(self.builds[4].hasChanges(A)) |
| 658 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 659 | self.assertTrue(self.builds[4].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 660 | |
| 661 | # Fail change B first |
| 662 | self.release(self.builds[2]) |
| 663 | self.waitUntilSettled() |
| 664 | |
| 665 | # restart of C after B failure |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 666 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 667 | self.waitUntilSettled() |
| 668 | |
| 669 | self.assertEqual(len(self.builds), 5) |
| 670 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 671 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 672 | self.assertEqual(self.builds[2].name, 'project-test2') |
| 673 | self.assertEqual(self.builds[3].name, 'project-test1') |
| 674 | self.assertEqual(self.builds[4].name, 'project-test2') |
| 675 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 676 | self.assertTrue(self.builds[1].hasChanges(A)) |
| 677 | self.assertTrue(self.builds[2].hasChanges(A)) |
| 678 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 679 | self.assertTrue(self.builds[4].hasChanges(A)) |
| 680 | self.assertFalse(self.builds[4].hasChanges(B)) |
| 681 | self.assertTrue(self.builds[4].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 682 | |
| 683 | # Finish running all passing jobs for change A |
| 684 | self.release(self.builds[1]) |
| 685 | self.waitUntilSettled() |
| 686 | # Fail and report change A |
| 687 | self.release(self.builds[0]) |
| 688 | self.waitUntilSettled() |
| 689 | |
| 690 | # restart of B,C after A failure |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 691 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 692 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 693 | self.launch_server.release('.*-merge') |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 694 | self.waitUntilSettled() |
| 695 | |
| 696 | self.assertEqual(len(self.builds), 4) |
| 697 | self.assertEqual(self.builds[0].name, 'project-test1') # B |
| 698 | self.assertEqual(self.builds[1].name, 'project-test2') # B |
| 699 | self.assertEqual(self.builds[2].name, 'project-test1') # C |
| 700 | self.assertEqual(self.builds[3].name, 'project-test2') # C |
| 701 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 702 | self.assertFalse(self.builds[1].hasChanges(A)) |
| 703 | self.assertTrue(self.builds[1].hasChanges(B)) |
| 704 | self.assertFalse(self.builds[1].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 705 | |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 706 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 707 | # After A failed and B and C restarted, B should be back in |
| 708 | # C's tests because it has not failed yet. |
Paul Belanger | 71dd2fc | 2016-11-04 19:05:55 -0400 | [diff] [blame] | 709 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 710 | self.assertTrue(self.builds[2].hasChanges(C)) |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 711 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 712 | self.launch_server.hold_jobs_in_build = False |
| 713 | self.launch_server.release() |
James E. Blair | fef7163 | 2013-09-23 11:15:47 -0700 | [diff] [blame] | 714 | self.waitUntilSettled() |
| 715 | |
| 716 | self.assertEqual(len(self.builds), 0) |
| 717 | self.assertEqual(len(self.history), 21) |
| 718 | self.assertEqual(A.data['status'], 'NEW') |
| 719 | self.assertEqual(B.data['status'], 'NEW') |
| 720 | self.assertEqual(C.data['status'], 'MERGED') |
| 721 | self.assertEqual(A.reported, 2) |
| 722 | self.assertEqual(B.reported, 2) |
| 723 | self.assertEqual(C.reported, 2) |
| 724 | |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 725 | def test_patch_order(self): |
| 726 | "Test that dependent patches are tested in the right order" |
| 727 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 728 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 729 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 730 | A.addApproval('code-review', 2) |
| 731 | B.addApproval('code-review', 2) |
| 732 | C.addApproval('code-review', 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 733 | |
| 734 | M2 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M2') |
| 735 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 736 | M2.setMerged() |
| 737 | M1.setMerged() |
| 738 | |
| 739 | # C -> B -> A -> M1 -> M2 |
| 740 | # M2 is here to make sure it is never queried. If it is, it |
| 741 | # means zuul is walking down the entire history of merged |
| 742 | # changes. |
| 743 | |
| 744 | C.setDependsOn(B, 1) |
| 745 | B.setDependsOn(A, 1) |
| 746 | A.setDependsOn(M1, 1) |
| 747 | M1.setDependsOn(M2, 1) |
| 748 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 749 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 750 | |
| 751 | self.waitUntilSettled() |
| 752 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 753 | self.assertEqual(A.data['status'], 'NEW') |
| 754 | self.assertEqual(B.data['status'], 'NEW') |
| 755 | self.assertEqual(C.data['status'], 'NEW') |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 756 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 757 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 758 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 759 | |
| 760 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 761 | self.assertEqual(M2.queried, 0) |
| 762 | self.assertEqual(A.data['status'], 'MERGED') |
| 763 | self.assertEqual(B.data['status'], 'MERGED') |
| 764 | self.assertEqual(C.data['status'], 'MERGED') |
| 765 | self.assertEqual(A.reported, 2) |
| 766 | self.assertEqual(B.reported, 2) |
| 767 | self.assertEqual(C.reported, 2) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 768 | |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 769 | def test_needed_changes_enqueue(self): |
| 770 | "Test that a needed change is enqueued ahead" |
| 771 | # A Given a git tree like this, if we enqueue |
| 772 | # / \ change C, we should walk up and down the tree |
| 773 | # B G and enqueue changes in the order ABCDEFG. |
| 774 | # /|\ This is also the order that you would get if |
| 775 | # *C E F you enqueued changes in the order ABCDEFG, so |
| 776 | # / the ordering is stable across re-enqueue events. |
| 777 | # D |
| 778 | |
| 779 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 780 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 781 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 782 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 783 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
| 784 | F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F') |
| 785 | G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G') |
| 786 | B.setDependsOn(A, 1) |
| 787 | C.setDependsOn(B, 1) |
| 788 | D.setDependsOn(C, 1) |
| 789 | E.setDependsOn(B, 1) |
| 790 | F.setDependsOn(B, 1) |
| 791 | G.setDependsOn(A, 1) |
| 792 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 793 | A.addApproval('code-review', 2) |
| 794 | B.addApproval('code-review', 2) |
| 795 | C.addApproval('code-review', 2) |
| 796 | D.addApproval('code-review', 2) |
| 797 | E.addApproval('code-review', 2) |
| 798 | F.addApproval('code-review', 2) |
| 799 | G.addApproval('code-review', 2) |
| 800 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 801 | |
| 802 | self.waitUntilSettled() |
| 803 | |
| 804 | self.assertEqual(A.data['status'], 'NEW') |
| 805 | self.assertEqual(B.data['status'], 'NEW') |
| 806 | self.assertEqual(C.data['status'], 'NEW') |
| 807 | self.assertEqual(D.data['status'], 'NEW') |
| 808 | self.assertEqual(E.data['status'], 'NEW') |
| 809 | self.assertEqual(F.data['status'], 'NEW') |
| 810 | self.assertEqual(G.data['status'], 'NEW') |
| 811 | |
| 812 | # We're about to add approvals to changes without adding the |
| 813 | # triggering events to Zuul, so that we can be sure that it is |
| 814 | # enqueing the changes based on dependencies, not because of |
| 815 | # triggering events. Since it will have the changes cached |
| 816 | # already (without approvals), we need to clear the cache |
| 817 | # first. |
Paul Belanger | 593480a | 2016-11-02 19:06:28 -0400 | [diff] [blame] | 818 | for connection in self.connections.connections.values(): |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 819 | connection.maintainCache([]) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 820 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 821 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 822 | A.addApproval('approved', 1) |
| 823 | B.addApproval('approved', 1) |
| 824 | D.addApproval('approved', 1) |
| 825 | E.addApproval('approved', 1) |
| 826 | F.addApproval('approved', 1) |
| 827 | G.addApproval('approved', 1) |
| 828 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 829 | |
| 830 | for x in range(8): |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 831 | self.launch_server.release('.*-merge') |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 832 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 833 | self.launch_server.hold_jobs_in_build = False |
| 834 | self.launch_server.release() |
James E. Blair | 063672f | 2015-01-29 13:09:12 -0800 | [diff] [blame] | 835 | self.waitUntilSettled() |
| 836 | |
| 837 | self.assertEqual(A.data['status'], 'MERGED') |
| 838 | self.assertEqual(B.data['status'], 'MERGED') |
| 839 | self.assertEqual(C.data['status'], 'MERGED') |
| 840 | self.assertEqual(D.data['status'], 'MERGED') |
| 841 | self.assertEqual(E.data['status'], 'MERGED') |
| 842 | self.assertEqual(F.data['status'], 'MERGED') |
| 843 | self.assertEqual(G.data['status'], 'MERGED') |
| 844 | self.assertEqual(A.reported, 2) |
| 845 | self.assertEqual(B.reported, 2) |
| 846 | self.assertEqual(C.reported, 2) |
| 847 | self.assertEqual(D.reported, 2) |
| 848 | self.assertEqual(E.reported, 2) |
| 849 | self.assertEqual(F.reported, 2) |
| 850 | self.assertEqual(G.reported, 2) |
| 851 | self.assertEqual(self.history[6].changes, |
| 852 | '1,1 2,1 3,1 4,1 5,1 6,1 7,1') |
| 853 | |
Joshua Hesketh | 850ccb6 | 2014-11-27 11:31:02 +1100 | [diff] [blame] | 854 | def test_source_cache(self): |
| 855 | "Test that the source cache operates correctly" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 856 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 857 | |
| 858 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 859 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 860 | X = self.fake_gerrit.addFakeChange('org/project', 'master', 'X') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 861 | A.addApproval('code-review', 2) |
| 862 | B.addApproval('code-review', 2) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 863 | |
| 864 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 865 | M1.setMerged() |
| 866 | |
| 867 | B.setDependsOn(A, 1) |
| 868 | A.setDependsOn(M1, 1) |
| 869 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 870 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 871 | self.fake_gerrit.addEvent(X.getPatchsetCreatedEvent(1)) |
| 872 | |
| 873 | self.waitUntilSettled() |
| 874 | |
| 875 | for build in self.builds: |
| 876 | if build.parameters['ZUUL_PIPELINE'] == 'check': |
| 877 | build.release() |
| 878 | self.waitUntilSettled() |
| 879 | for build in self.builds: |
| 880 | if build.parameters['ZUUL_PIPELINE'] == 'check': |
| 881 | build.release() |
| 882 | self.waitUntilSettled() |
| 883 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 884 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 885 | self.waitUntilSettled() |
| 886 | |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 887 | self.log.debug("len %s" % self.fake_gerrit._change_cache.keys()) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 888 | # there should still be changes in the cache |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 889 | self.assertNotEqual(len(self.fake_gerrit._change_cache.keys()), 0) |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 890 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 891 | self.launch_server.hold_jobs_in_build = False |
| 892 | self.launch_server.release() |
James E. Blair | 0e933c5 | 2013-07-11 10:18:52 -0700 | [diff] [blame] | 893 | self.waitUntilSettled() |
| 894 | |
| 895 | self.assertEqual(A.data['status'], 'MERGED') |
| 896 | self.assertEqual(B.data['status'], 'MERGED') |
| 897 | self.assertEqual(A.queried, 2) # Initial and isMerged |
| 898 | self.assertEqual(B.queried, 3) # Initial A, refresh from B, isMerged |
| 899 | |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 900 | def test_can_merge(self): |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 901 | "Test whether a change is ready to merge" |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 902 | # TODO: move to test_gerrit (this is a unit test!) |
| 903 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 904 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 905 | source = tenant.layout.pipelines['gate'].source |
| 906 | |
| 907 | # TODO(pabelanger): As we add more source / trigger APIs we should make |
| 908 | # it easier for users to create events for testing. |
| 909 | event = zuul.model.TriggerEvent() |
| 910 | event.trigger_name = 'gerrit' |
| 911 | event.change_number = '1' |
| 912 | event.patch_number = '2' |
| 913 | |
| 914 | a = source.getChange(event) |
| 915 | mgr = tenant.layout.pipelines['gate'].manager |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 916 | self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 917 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 918 | A.addApproval('code-review', 2) |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 919 | a = source.getChange(event, refresh=True) |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 920 | self.assertFalse(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 8c803f8 | 2012-07-31 16:25:42 -0700 | [diff] [blame] | 921 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 922 | A.addApproval('approved', 1) |
Paul Belanger | 9bba490 | 2016-11-02 16:07:33 -0400 | [diff] [blame] | 923 | a = source.getChange(event, refresh=True) |
James E. Blair | c0dedf8 | 2014-08-06 09:37:52 -0700 | [diff] [blame] | 924 | self.assertTrue(source.canMerge(a, mgr.getSubmitAllowNeeds())) |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 925 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 926 | @skip("Disabled for early v3 development") |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 927 | def test_build_configuration(self): |
| 928 | "Test that zuul merges the right commits for testing" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 929 | |
| 930 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 931 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 932 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 933 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 934 | A.addApproval('code-review', 2) |
| 935 | B.addApproval('code-review', 2) |
| 936 | C.addApproval('code-review', 2) |
| 937 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 938 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 939 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 940 | self.waitUntilSettled() |
| 941 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 942 | self.gearman_server.release('.*-merge') |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 943 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 944 | self.gearman_server.release('.*-merge') |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 945 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 946 | self.gearman_server.release('.*-merge') |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 947 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 948 | queue = self.gearman_server.getQueue() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 949 | ref = self.getParameter(queue[-1], 'ZUUL_REF') |
| 950 | self.gearman_server.hold_jobs_in_queue = False |
| 951 | self.gearman_server.release() |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 952 | self.waitUntilSettled() |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 953 | |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 954 | path = os.path.join(self.git_root, "org/project") |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 955 | repo = git.Repo(path) |
| 956 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 957 | repo_messages.reverse() |
James E. Blair | 4886cc1 | 2012-07-18 15:39:41 -0700 | [diff] [blame] | 958 | correct_messages = ['initial commit', 'A-1', 'B-1', 'C-1'] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 959 | self.assertEqual(repo_messages, correct_messages) |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 960 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 961 | @skip("Disabled for early v3 development") |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 962 | def test_build_configuration_conflict(self): |
| 963 | "Test that merge conflicts are handled" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 964 | |
| 965 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 966 | A = self.fake_gerrit.addFakeChange('org/conflict-project', |
| 967 | 'master', 'A') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 968 | A.addPatchset(['conflict']) |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 969 | B = self.fake_gerrit.addFakeChange('org/conflict-project', |
| 970 | 'master', 'B') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 971 | B.addPatchset(['conflict']) |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 972 | C = self.fake_gerrit.addFakeChange('org/conflict-project', |
| 973 | 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 974 | A.addApproval('code-review', 2) |
| 975 | B.addApproval('code-review', 2) |
| 976 | C.addApproval('code-review', 2) |
| 977 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 978 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 979 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 980 | self.waitUntilSettled() |
| 981 | |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 982 | self.assertEqual(A.reported, 1) |
| 983 | self.assertEqual(B.reported, 1) |
| 984 | self.assertEqual(C.reported, 1) |
| 985 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 986 | self.gearman_server.release('.*-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 987 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 988 | self.gearman_server.release('.*-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 989 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 990 | self.gearman_server.release('.*-merge') |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 991 | self.waitUntilSettled() |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 992 | |
| 993 | self.assertEqual(len(self.history), 2) # A and C merge jobs |
| 994 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 995 | self.gearman_server.hold_jobs_in_queue = False |
| 996 | self.gearman_server.release() |
James E. Blair | 973721f | 2012-08-15 10:19:43 -0700 | [diff] [blame] | 997 | self.waitUntilSettled() |
| 998 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 999 | self.assertEqual(A.data['status'], 'MERGED') |
| 1000 | self.assertEqual(B.data['status'], 'NEW') |
| 1001 | self.assertEqual(C.data['status'], 'MERGED') |
| 1002 | self.assertEqual(A.reported, 2) |
| 1003 | self.assertEqual(B.reported, 2) |
| 1004 | self.assertEqual(C.reported, 2) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1005 | self.assertEqual(len(self.history), 6) |
James E. Blair | 6736beb | 2013-07-11 15:18:15 -0700 | [diff] [blame] | 1006 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1007 | @skip("Disabled for early v3 development") |
James E. Blair | daabed2 | 2012-08-15 15:38:57 -0700 | [diff] [blame] | 1008 | def test_post(self): |
| 1009 | "Test that post jobs run" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1010 | |
Zhongyue Luo | 5d55607 | 2012-09-21 02:00:47 +0900 | [diff] [blame] | 1011 | e = { |
| 1012 | "type": "ref-updated", |
| 1013 | "submitter": { |
| 1014 | "name": "User Name", |
| 1015 | }, |
| 1016 | "refUpdate": { |
| 1017 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1018 | "newRev": "d479a0bfcb34da57a31adb2a595c0cf687812543", |
| 1019 | "refName": "master", |
| 1020 | "project": "org/project", |
| 1021 | } |
| 1022 | } |
James E. Blair | daabed2 | 2012-08-15 15:38:57 -0700 | [diff] [blame] | 1023 | self.fake_gerrit.addEvent(e) |
| 1024 | self.waitUntilSettled() |
| 1025 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1026 | job_names = [x.name for x in self.history] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1027 | self.assertEqual(len(self.history), 1) |
| 1028 | self.assertIn('project-post', job_names) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1029 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1030 | @skip("Disabled for early v3 development") |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1031 | def test_post_ignore_deletes(self): |
| 1032 | "Test that deleting refs does not trigger post jobs" |
| 1033 | |
| 1034 | e = { |
| 1035 | "type": "ref-updated", |
| 1036 | "submitter": { |
| 1037 | "name": "User Name", |
| 1038 | }, |
| 1039 | "refUpdate": { |
| 1040 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1041 | "newRev": "0000000000000000000000000000000000000000", |
| 1042 | "refName": "master", |
| 1043 | "project": "org/project", |
| 1044 | } |
| 1045 | } |
| 1046 | self.fake_gerrit.addEvent(e) |
| 1047 | self.waitUntilSettled() |
| 1048 | |
| 1049 | job_names = [x.name for x in self.history] |
| 1050 | self.assertEqual(len(self.history), 0) |
| 1051 | self.assertNotIn('project-post', job_names) |
| 1052 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1053 | @skip("Disabled for early v3 development") |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1054 | def test_post_ignore_deletes_negative(self): |
| 1055 | "Test that deleting refs does trigger post jobs" |
| 1056 | |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 1057 | self.updateConfigLayout( |
| 1058 | 'tests/fixtures/layout-dont-ignore-deletes.yaml') |
K Jonathan Harker | f95e723 | 2015-04-29 13:33:16 -0700 | [diff] [blame] | 1059 | self.sched.reconfigure(self.config) |
| 1060 | |
| 1061 | e = { |
| 1062 | "type": "ref-updated", |
| 1063 | "submitter": { |
| 1064 | "name": "User Name", |
| 1065 | }, |
| 1066 | "refUpdate": { |
| 1067 | "oldRev": "90f173846e3af9154517b88543ffbd1691f31366", |
| 1068 | "newRev": "0000000000000000000000000000000000000000", |
| 1069 | "refName": "master", |
| 1070 | "project": "org/project", |
| 1071 | } |
| 1072 | } |
| 1073 | self.fake_gerrit.addEvent(e) |
| 1074 | self.waitUntilSettled() |
| 1075 | |
| 1076 | job_names = [x.name for x in self.history] |
| 1077 | self.assertEqual(len(self.history), 1) |
| 1078 | self.assertIn('project-post', job_names) |
| 1079 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1080 | @skip("Disabled for early v3 development") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1081 | def test_build_configuration_branch(self): |
| 1082 | "Test that the right commits are on alternate branches" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1083 | |
| 1084 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1085 | A = self.fake_gerrit.addFakeChange('org/project', 'mp', 'A') |
| 1086 | B = self.fake_gerrit.addFakeChange('org/project', 'mp', 'B') |
| 1087 | C = self.fake_gerrit.addFakeChange('org/project', 'mp', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1088 | A.addApproval('code-review', 2) |
| 1089 | B.addApproval('code-review', 2) |
| 1090 | C.addApproval('code-review', 2) |
| 1091 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1092 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1093 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1094 | self.waitUntilSettled() |
| 1095 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1096 | self.gearman_server.release('.*-merge') |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1097 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1098 | self.gearman_server.release('.*-merge') |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1099 | self.waitUntilSettled() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1100 | self.gearman_server.release('.*-merge') |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1101 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 1102 | queue = self.gearman_server.getQueue() |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1103 | ref = self.getParameter(queue[-1], 'ZUUL_REF') |
| 1104 | self.gearman_server.hold_jobs_in_queue = False |
| 1105 | self.gearman_server.release() |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1106 | self.waitUntilSettled() |
| 1107 | |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1108 | path = os.path.join(self.git_root, "org/project") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1109 | repo = git.Repo(path) |
| 1110 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 1111 | repo_messages.reverse() |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1112 | correct_messages = ['initial commit', 'mp commit', 'A-1', 'B-1', 'C-1'] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1113 | self.assertEqual(repo_messages, correct_messages) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1114 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1115 | @skip("Disabled for early v3 development") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1116 | def test_build_configuration_branch_interaction(self): |
| 1117 | "Test that switching between branches works" |
| 1118 | self.test_build_configuration() |
| 1119 | self.test_build_configuration_branch() |
| 1120 | # C has been merged, undo that |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1121 | path = os.path.join(self.upstream_root, "org/project") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1122 | repo = git.Repo(path) |
| 1123 | repo.heads.master.commit = repo.commit('init') |
| 1124 | self.test_build_configuration() |
| 1125 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1126 | @skip("Disabled for early v3 development") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1127 | def test_build_configuration_multi_branch(self): |
| 1128 | "Test that dependent changes on multiple branches are merged" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1129 | |
| 1130 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1131 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1132 | B = self.fake_gerrit.addFakeChange('org/project', 'mp', 'B') |
| 1133 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1134 | A.addApproval('code-review', 2) |
| 1135 | B.addApproval('code-review', 2) |
| 1136 | C.addApproval('code-review', 2) |
| 1137 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1138 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1139 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1140 | self.waitUntilSettled() |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1141 | queue = self.gearman_server.getQueue() |
| 1142 | job_A = None |
| 1143 | for job in queue: |
| 1144 | if 'project-merge' in job.name: |
| 1145 | job_A = job |
| 1146 | ref_A = self.getParameter(job_A, 'ZUUL_REF') |
| 1147 | commit_A = self.getParameter(job_A, 'ZUUL_COMMIT') |
| 1148 | self.log.debug("Got Zuul ref for change A: %s" % ref_A) |
| 1149 | self.log.debug("Got Zuul commit for change A: %s" % commit_A) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1150 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1151 | self.gearman_server.release('.*-merge') |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1152 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 1153 | queue = self.gearman_server.getQueue() |
James E. Blair | d320d7e | 2013-07-30 16:36:20 -0700 | [diff] [blame] | 1154 | job_B = None |
| 1155 | for job in queue: |
| 1156 | if 'project-merge' in job.name: |
| 1157 | job_B = job |
| 1158 | ref_B = self.getParameter(job_B, 'ZUUL_REF') |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1159 | commit_B = self.getParameter(job_B, 'ZUUL_COMMIT') |
James E. Blair | f750aa0 | 2013-07-15 14:11:24 -0700 | [diff] [blame] | 1160 | self.log.debug("Got Zuul ref for change B: %s" % ref_B) |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1161 | self.log.debug("Got Zuul commit for change B: %s" % commit_B) |
| 1162 | |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1163 | self.gearman_server.release('.*-merge') |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1164 | self.waitUntilSettled() |
James E. Blair | 701c5b4 | 2013-06-06 09:34:59 -0700 | [diff] [blame] | 1165 | queue = self.gearman_server.getQueue() |
James E. Blair | d320d7e | 2013-07-30 16:36:20 -0700 | [diff] [blame] | 1166 | for job in queue: |
| 1167 | if 'project-merge' in job.name: |
| 1168 | job_C = job |
| 1169 | ref_C = self.getParameter(job_C, 'ZUUL_REF') |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1170 | commit_C = self.getParameter(job_C, 'ZUUL_COMMIT') |
James E. Blair | f750aa0 | 2013-07-15 14:11:24 -0700 | [diff] [blame] | 1171 | self.log.debug("Got Zuul ref for change C: %s" % ref_C) |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1172 | self.log.debug("Got Zuul commit for change C: %s" % commit_C) |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1173 | self.gearman_server.hold_jobs_in_queue = False |
| 1174 | self.gearman_server.release() |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1175 | self.waitUntilSettled() |
| 1176 | |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1177 | path = os.path.join(self.git_root, "org/project") |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1178 | repo = git.Repo(path) |
| 1179 | |
| 1180 | repo_messages = [c.message.strip() |
James E. Blair | f750aa0 | 2013-07-15 14:11:24 -0700 | [diff] [blame] | 1181 | for c in repo.iter_commits(ref_C)] |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1182 | repo_shas = [c.hexsha for c in repo.iter_commits(ref_C)] |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1183 | repo_messages.reverse() |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1184 | correct_messages = ['initial commit', 'A-1', 'C-1'] |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1185 | # Ensure the right commits are in the history for this ref |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1186 | self.assertEqual(repo_messages, correct_messages) |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1187 | # Ensure ZUUL_REF -> ZUUL_COMMIT |
| 1188 | self.assertEqual(repo_shas[0], commit_C) |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1189 | |
| 1190 | repo_messages = [c.message.strip() |
James E. Blair | f750aa0 | 2013-07-15 14:11:24 -0700 | [diff] [blame] | 1191 | for c in repo.iter_commits(ref_B)] |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1192 | repo_shas = [c.hexsha for c in repo.iter_commits(ref_B)] |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1193 | repo_messages.reverse() |
James E. Blair | c6294a5 | 2012-08-17 10:19:48 -0700 | [diff] [blame] | 1194 | correct_messages = ['initial commit', 'mp commit', 'B-1'] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1195 | self.assertEqual(repo_messages, correct_messages) |
James E. Blair | bb1fe50 | 2014-03-04 10:15:06 -0800 | [diff] [blame] | 1196 | self.assertEqual(repo_shas[0], commit_B) |
| 1197 | |
| 1198 | repo_messages = [c.message.strip() |
| 1199 | for c in repo.iter_commits(ref_A)] |
| 1200 | repo_shas = [c.hexsha for c in repo.iter_commits(ref_A)] |
| 1201 | repo_messages.reverse() |
| 1202 | correct_messages = ['initial commit', 'A-1'] |
| 1203 | self.assertEqual(repo_messages, correct_messages) |
| 1204 | self.assertEqual(repo_shas[0], commit_A) |
| 1205 | |
| 1206 | self.assertNotEqual(ref_A, ref_B, ref_C) |
| 1207 | self.assertNotEqual(commit_A, commit_B, commit_C) |
James E. Blair | 7f71c80 | 2012-08-22 13:04:32 -0700 | [diff] [blame] | 1208 | |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1209 | def test_dependent_changes_dequeue(self): |
| 1210 | "Test that dependent patches are not needlessly tested" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1211 | |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1212 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1213 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1214 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1215 | A.addApproval('code-review', 2) |
| 1216 | B.addApproval('code-review', 2) |
| 1217 | C.addApproval('code-review', 2) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1218 | |
| 1219 | M1 = self.fake_gerrit.addFakeChange('org/project', 'master', 'M1') |
| 1220 | M1.setMerged() |
| 1221 | |
| 1222 | # C -> B -> A -> M1 |
| 1223 | |
| 1224 | C.setDependsOn(B, 1) |
| 1225 | B.setDependsOn(A, 1) |
| 1226 | A.setDependsOn(M1, 1) |
| 1227 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1228 | self.launch_server.failJob('project-merge', A) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1229 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1230 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1231 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1232 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1233 | |
| 1234 | self.waitUntilSettled() |
| 1235 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1236 | self.assertEqual(A.data['status'], 'NEW') |
| 1237 | self.assertEqual(A.reported, 2) |
| 1238 | self.assertEqual(B.data['status'], 'NEW') |
| 1239 | self.assertEqual(B.reported, 2) |
| 1240 | self.assertEqual(C.data['status'], 'NEW') |
| 1241 | self.assertEqual(C.reported, 2) |
| 1242 | self.assertEqual(len(self.history), 1) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1243 | |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1244 | def test_failing_dependent_changes(self): |
| 1245 | "Test that failing dependent patches are taken out of stream" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1246 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1247 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1248 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1249 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1250 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 1251 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1252 | A.addApproval('code-review', 2) |
| 1253 | B.addApproval('code-review', 2) |
| 1254 | C.addApproval('code-review', 2) |
| 1255 | D.addApproval('code-review', 2) |
| 1256 | E.addApproval('code-review', 2) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1257 | |
| 1258 | # E, D -> C -> B, A |
| 1259 | |
| 1260 | D.setDependsOn(C, 1) |
| 1261 | C.setDependsOn(B, 1) |
| 1262 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1263 | self.launch_server.failJob('project-test1', B) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1264 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1265 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1266 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
| 1267 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1268 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1269 | self.fake_gerrit.addEvent(E.addApproval('approved', 1)) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1270 | |
| 1271 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1272 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1273 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1274 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1275 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1276 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1277 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1278 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1279 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1280 | self.launch_server.release('.*-merge') |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1281 | self.waitUntilSettled() |
| 1282 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1283 | self.launch_server.hold_jobs_in_build = False |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1284 | for build in self.builds: |
| 1285 | if build.parameters['ZUUL_CHANGE'] != '1': |
| 1286 | build.release() |
| 1287 | self.waitUntilSettled() |
| 1288 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1289 | self.launch_server.release() |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1290 | self.waitUntilSettled() |
| 1291 | |
| 1292 | self.assertEqual(A.data['status'], 'MERGED') |
| 1293 | self.assertEqual(A.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1294 | self.assertIn('Build succeeded', A.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1295 | self.assertEqual(B.data['status'], 'NEW') |
| 1296 | self.assertEqual(B.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1297 | self.assertIn('Build failed', B.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1298 | self.assertEqual(C.data['status'], 'NEW') |
| 1299 | self.assertEqual(C.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1300 | self.assertIn('depends on a change', C.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1301 | self.assertEqual(D.data['status'], 'NEW') |
| 1302 | self.assertEqual(D.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1303 | self.assertIn('depends on a change', D.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1304 | self.assertEqual(E.data['status'], 'MERGED') |
| 1305 | self.assertEqual(E.reported, 2) |
Jeremy Stanley | 1083713 | 2014-08-02 16:10:56 +0000 | [diff] [blame] | 1306 | self.assertIn('Build succeeded', E.messages[1]) |
James E. Blair | 972e3c7 | 2013-08-29 12:04:55 -0700 | [diff] [blame] | 1307 | self.assertEqual(len(self.history), 18) |
| 1308 | |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1309 | def test_head_is_dequeued_once(self): |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1310 | "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] | 1311 | # If it's dequeued more than once, we should see extra |
| 1312 | # aborted jobs. |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1313 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1314 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1315 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 1316 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 1317 | C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1318 | A.addApproval('code-review', 2) |
| 1319 | B.addApproval('code-review', 2) |
| 1320 | C.addApproval('code-review', 2) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1321 | |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1322 | self.launch_server.failJob('project-test1', A) |
| 1323 | self.launch_server.failJob('project-test2', A) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1324 | self.launch_server.failJob('project1-project2-integration', A) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1325 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1326 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1327 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1328 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1329 | |
| 1330 | self.waitUntilSettled() |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1331 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1332 | self.assertEqual(len(self.builds), 1) |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1333 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 1334 | self.assertTrue(self.builds[0].hasChanges(A)) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1335 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1336 | self.launch_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1337 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1338 | self.launch_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1339 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1340 | self.launch_server.release('.*-merge') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1341 | self.waitUntilSettled() |
| 1342 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1343 | self.assertEqual(len(self.builds), 9) |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1344 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 1345 | self.assertEqual(self.builds[1].name, 'project-test2') |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1346 | self.assertEqual(self.builds[2].name, 'project1-project2-integration') |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1347 | self.assertEqual(self.builds[3].name, 'project-test1') |
| 1348 | self.assertEqual(self.builds[4].name, 'project-test2') |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1349 | self.assertEqual(self.builds[5].name, 'project1-project2-integration') |
Paul Belanger | 58bf691 | 2016-11-11 19:36:01 -0500 | [diff] [blame] | 1350 | self.assertEqual(self.builds[6].name, 'project-test1') |
| 1351 | self.assertEqual(self.builds[7].name, 'project-test2') |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1352 | self.assertEqual(self.builds[8].name, 'project1-project2-integration') |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1353 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1354 | self.release(self.builds[0]) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1355 | self.waitUntilSettled() |
| 1356 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1357 | self.assertEqual(len(self.builds), 3) # test2,integration, merge for B |
| 1358 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 6) |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1359 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1360 | self.launch_server.hold_jobs_in_build = False |
| 1361 | self.launch_server.release() |
James E. Blair | ec59012 | 2012-08-22 15:19:31 -0700 | [diff] [blame] | 1362 | self.waitUntilSettled() |
| 1363 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1364 | self.assertEqual(len(self.builds), 0) |
| 1365 | self.assertEqual(len(self.history), 20) |
James E. Blair | caec0c5 | 2012-08-22 14:52:22 -0700 | [diff] [blame] | 1366 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1367 | self.assertEqual(A.data['status'], 'NEW') |
| 1368 | self.assertEqual(B.data['status'], 'MERGED') |
| 1369 | self.assertEqual(C.data['status'], 'MERGED') |
| 1370 | self.assertEqual(A.reported, 2) |
| 1371 | self.assertEqual(B.reported, 2) |
| 1372 | self.assertEqual(C.reported, 2) |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1373 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1374 | @skip("Disabled for early v3 development") |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1375 | def test_nonvoting_job(self): |
| 1376 | "Test that non-voting jobs don't vote." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1377 | |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1378 | A = self.fake_gerrit.addFakeChange('org/nonvoting-project', |
| 1379 | 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1380 | A.addApproval('code-review', 2) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1381 | self.launch_server.failJob('nonvoting-project-test2', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1382 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1383 | |
| 1384 | self.waitUntilSettled() |
James E. Blair | 4ec821f | 2012-08-23 15:28:28 -0700 | [diff] [blame] | 1385 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1386 | self.assertEqual(A.data['status'], 'MERGED') |
| 1387 | self.assertEqual(A.reported, 2) |
| 1388 | self.assertEqual( |
| 1389 | self.getJobFromHistory('nonvoting-project-merge').result, |
| 1390 | 'SUCCESS') |
| 1391 | self.assertEqual( |
| 1392 | self.getJobFromHistory('nonvoting-project-test1').result, |
| 1393 | 'SUCCESS') |
| 1394 | self.assertEqual( |
| 1395 | self.getJobFromHistory('nonvoting-project-test2').result, |
| 1396 | 'FAILURE') |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1397 | |
James E. Blair | 5821bd9 | 2015-09-16 08:48:15 -0700 | [diff] [blame] | 1398 | for build in self.builds: |
| 1399 | self.assertEqual(build.parameters['ZUUL_VOTING'], '0') |
| 1400 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1401 | def test_check_queue_success(self): |
| 1402 | "Test successful check queue jobs." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1403 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1404 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1405 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1406 | |
| 1407 | self.waitUntilSettled() |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1408 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1409 | self.assertEqual(A.data['status'], 'NEW') |
| 1410 | self.assertEqual(A.reported, 1) |
| 1411 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1412 | 'SUCCESS') |
| 1413 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1414 | 'SUCCESS') |
| 1415 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1416 | 'SUCCESS') |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1417 | |
| 1418 | def test_check_queue_failure(self): |
| 1419 | "Test failed check queue jobs." |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1420 | |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1421 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1422 | self.launch_server.failJob('project-test2', A) |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1423 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1424 | |
| 1425 | self.waitUntilSettled() |
James E. Blair | e048707 | 2012-08-29 17:38:31 -0700 | [diff] [blame] | 1426 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1427 | self.assertEqual(A.data['status'], 'NEW') |
| 1428 | self.assertEqual(A.reported, 1) |
| 1429 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
James E. Blair | 78e31b3 | 2013-07-09 09:11:34 -0700 | [diff] [blame] | 1430 | 'SUCCESS') |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1431 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1432 | 'SUCCESS') |
| 1433 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1434 | 'FAILURE') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1435 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1436 | @skip("Disabled for early v3 development") |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1437 | def test_dependent_behind_dequeue(self): |
| 1438 | "test that dependent changes behind dequeued changes work" |
| 1439 | # This complicated test is a reproduction of a real life bug |
| 1440 | self.sched.reconfigure(self.config) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1441 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1442 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1443 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 1444 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 1445 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 1446 | D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') |
| 1447 | E = self.fake_gerrit.addFakeChange('org/project2', 'master', 'E') |
| 1448 | F = self.fake_gerrit.addFakeChange('org/project3', 'master', 'F') |
| 1449 | D.setDependsOn(C, 1) |
| 1450 | E.setDependsOn(D, 1) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1451 | A.addApproval('code-review', 2) |
| 1452 | B.addApproval('code-review', 2) |
| 1453 | C.addApproval('code-review', 2) |
| 1454 | D.addApproval('code-review', 2) |
| 1455 | E.addApproval('code-review', 2) |
| 1456 | F.addApproval('code-review', 2) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1457 | |
| 1458 | A.fail_merge = True |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1459 | |
| 1460 | # Change object re-use in the gerrit trigger is hidden if |
| 1461 | # changes are added in quick succession; waiting makes it more |
| 1462 | # like real life. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1463 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1464 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1465 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1466 | self.waitUntilSettled() |
| 1467 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1468 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1469 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1470 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1471 | self.waitUntilSettled() |
| 1472 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1473 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1474 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1475 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1476 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1477 | self.fake_gerrit.addEvent(E.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1478 | self.waitUntilSettled() |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1479 | self.fake_gerrit.addEvent(F.addApproval('approved', 1)) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1480 | self.waitUntilSettled() |
| 1481 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1482 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1483 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1484 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1485 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1486 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1487 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1488 | self.launch_server.release('.*-merge') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1489 | self.waitUntilSettled() |
| 1490 | |
| 1491 | # all jobs running |
James E. Blair | e955e06 | 2012-10-08 09:49:03 -0700 | [diff] [blame] | 1492 | |
| 1493 | # Grab pointers to the jobs we want to release before |
| 1494 | # releasing any, because list indexes may change as |
| 1495 | # the jobs complete. |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1496 | a, b, c = self.builds[:3] |
James E. Blair | e955e06 | 2012-10-08 09:49:03 -0700 | [diff] [blame] | 1497 | a.release() |
| 1498 | b.release() |
| 1499 | c.release() |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1500 | self.waitUntilSettled() |
| 1501 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1502 | self.launch_server.hold_jobs_in_build = False |
| 1503 | self.launch_server.release() |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1504 | self.waitUntilSettled() |
| 1505 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1506 | self.assertEqual(A.data['status'], 'NEW') |
| 1507 | self.assertEqual(B.data['status'], 'MERGED') |
| 1508 | self.assertEqual(C.data['status'], 'MERGED') |
| 1509 | self.assertEqual(D.data['status'], 'MERGED') |
| 1510 | self.assertEqual(E.data['status'], 'MERGED') |
| 1511 | self.assertEqual(F.data['status'], 'MERGED') |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1512 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1513 | self.assertEqual(A.reported, 2) |
| 1514 | self.assertEqual(B.reported, 2) |
| 1515 | self.assertEqual(C.reported, 2) |
| 1516 | self.assertEqual(D.reported, 2) |
| 1517 | self.assertEqual(E.reported, 2) |
| 1518 | self.assertEqual(F.reported, 2) |
James E. Blair | 127bc18 | 2012-08-28 15:55:15 -0700 | [diff] [blame] | 1519 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1520 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 15) |
| 1521 | self.assertEqual(len(self.history), 44) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1522 | |
| 1523 | def test_merger_repack(self): |
| 1524 | "Test that the merger works after a repack" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1525 | |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1526 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1527 | A.addApproval('code-review', 2) |
| 1528 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1529 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1530 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1531 | 'SUCCESS') |
| 1532 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1533 | 'SUCCESS') |
| 1534 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1535 | 'SUCCESS') |
| 1536 | self.assertEqual(A.data['status'], 'MERGED') |
| 1537 | self.assertEqual(A.reported, 2) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1538 | self.assertEmptyQueues() |
Paul Belanger | 5bfe9e7 | 2016-11-04 19:20:04 -0400 | [diff] [blame] | 1539 | self.build_history = [] |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1540 | |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1541 | path = os.path.join(self.git_root, "org/project") |
Morgan Fainberg | 4c6a774 | 2016-05-27 08:42:17 -0700 | [diff] [blame] | 1542 | print(repack_repo(path)) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1543 | |
| 1544 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1545 | A.addApproval('code-review', 2) |
| 1546 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 05fed60 | 2012-09-07 12:45:24 -0700 | [diff] [blame] | 1547 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1548 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1549 | 'SUCCESS') |
| 1550 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1551 | 'SUCCESS') |
| 1552 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1553 | 'SUCCESS') |
| 1554 | self.assertEqual(A.data['status'], 'MERGED') |
| 1555 | self.assertEqual(A.reported, 2) |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1556 | |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1557 | def test_merger_repack_large_change(self): |
| 1558 | "Test that the merger works with large changes after a repack" |
| 1559 | # https://bugs.launchpad.net/zuul/+bug/1078946 |
James E. Blair | ac2c324 | 2014-01-24 13:38:51 -0800 | [diff] [blame] | 1560 | # This test assumes the repo is already cloned; make sure it is |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1561 | tenant = self.sched.abide.tenants.get('tenant-one') |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 1562 | url = self.fake_gerrit.getGitUrl( |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1563 | tenant.layout.project_configs.get('org/project1')) |
James E. Blair | 4076e2b | 2014-01-28 12:42:20 -0800 | [diff] [blame] | 1564 | self.merge_server.merger.addProject('org/project1', url) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1565 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 1566 | A.addPatchset(large=True) |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1567 | path = os.path.join(self.upstream_root, "org/project1") |
Morgan Fainberg | 4c6a774 | 2016-05-27 08:42:17 -0700 | [diff] [blame] | 1568 | print(repack_repo(path)) |
Monty Taylor | bc75883 | 2013-06-17 17:22:42 -0400 | [diff] [blame] | 1569 | path = os.path.join(self.git_root, "org/project1") |
Morgan Fainberg | 4c6a774 | 2016-05-27 08:42:17 -0700 | [diff] [blame] | 1570 | print(repack_repo(path)) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1571 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1572 | A.addApproval('code-review', 2) |
| 1573 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1574 | self.waitUntilSettled() |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1575 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1576 | 'SUCCESS') |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1577 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1578 | 'SUCCESS') |
Paul Belanger | 503bded | 2016-11-11 19:43:38 -0500 | [diff] [blame] | 1579 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1580 | 'SUCCESS') |
| 1581 | self.assertEqual(A.data['status'], 'MERGED') |
| 1582 | self.assertEqual(A.reported, 2) |
James E. Blair | 4886f28 | 2012-11-15 09:27:33 -0800 | [diff] [blame] | 1583 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1584 | @skip("Disabled for early v3 development") |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1585 | def test_nonexistent_job(self): |
| 1586 | "Test launching a job that doesn't exist" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1587 | # Set to the state immediately after a restart |
| 1588 | self.resetGearmanServer() |
| 1589 | self.launcher.negative_function_cache_ttl = 0 |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1590 | |
| 1591 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1592 | A.addApproval('code-review', 2) |
| 1593 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1594 | # There may be a thread about to report a lost change |
| 1595 | while A.reported < 2: |
| 1596 | self.waitUntilSettled() |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 1597 | job_names = [x.name for x in self.history] |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1598 | self.assertFalse(job_names) |
| 1599 | self.assertEqual(A.data['status'], 'NEW') |
| 1600 | self.assertEqual(A.reported, 2) |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1601 | self.assertEmptyQueues() |
| 1602 | |
| 1603 | # Make sure things still work: |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 1604 | self.registerJobs() |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1605 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1606 | A.addApproval('code-review', 2) |
| 1607 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 7ee88a2 | 2012-09-12 18:59:31 +0200 | [diff] [blame] | 1608 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1609 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 1610 | 'SUCCESS') |
| 1611 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 1612 | 'SUCCESS') |
| 1613 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 1614 | 'SUCCESS') |
| 1615 | self.assertEqual(A.data['status'], 'MERGED') |
| 1616 | self.assertEqual(A.reported, 2) |
James E. Blair | f62d428 | 2012-12-31 17:01:50 -0800 | [diff] [blame] | 1617 | |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1618 | def test_new_patchset_dequeues_old(self): |
| 1619 | "Test that a new patchset causes the old to be dequeued" |
| 1620 | # D -> C (depends on B) -> B (depends on A) -> A -> M |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1621 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1622 | M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M') |
| 1623 | M.setMerged() |
| 1624 | |
| 1625 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1626 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1627 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1628 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1629 | A.addApproval('code-review', 2) |
| 1630 | B.addApproval('code-review', 2) |
| 1631 | C.addApproval('code-review', 2) |
| 1632 | D.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1633 | |
| 1634 | C.setDependsOn(B, 1) |
| 1635 | B.setDependsOn(A, 1) |
| 1636 | A.setDependsOn(M, 1) |
| 1637 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1638 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1639 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1640 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1641 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1642 | self.waitUntilSettled() |
| 1643 | |
| 1644 | B.addPatchset() |
| 1645 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1646 | self.waitUntilSettled() |
| 1647 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1648 | self.launch_server.hold_jobs_in_build = False |
| 1649 | self.launch_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1650 | self.waitUntilSettled() |
| 1651 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1652 | self.assertEqual(A.data['status'], 'MERGED') |
| 1653 | self.assertEqual(A.reported, 2) |
| 1654 | self.assertEqual(B.data['status'], 'NEW') |
| 1655 | self.assertEqual(B.reported, 2) |
| 1656 | self.assertEqual(C.data['status'], 'NEW') |
| 1657 | self.assertEqual(C.reported, 2) |
| 1658 | self.assertEqual(D.data['status'], 'MERGED') |
| 1659 | self.assertEqual(D.reported, 2) |
| 1660 | 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] | 1661 | |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1662 | def test_new_patchset_check(self): |
| 1663 | "Test a new patchset in check" |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1664 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1665 | self.launch_server.hold_jobs_in_build = True |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1666 | |
| 1667 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1668 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Paul Belanger | 18e5f63 | 2016-11-03 15:24:16 -0400 | [diff] [blame] | 1669 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 1670 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1671 | |
| 1672 | # Add two git-dependent changes |
| 1673 | B.setDependsOn(A, 1) |
| 1674 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1675 | self.waitUntilSettled() |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1676 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1677 | self.waitUntilSettled() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1678 | |
| 1679 | # A live item, and a non-live/live pair |
| 1680 | items = check_pipeline.getAllItems() |
| 1681 | self.assertEqual(len(items), 3) |
| 1682 | |
| 1683 | self.assertEqual(items[0].change.number, '1') |
| 1684 | self.assertEqual(items[0].change.patchset, '1') |
| 1685 | self.assertFalse(items[0].live) |
| 1686 | |
| 1687 | self.assertEqual(items[1].change.number, '2') |
| 1688 | self.assertEqual(items[1].change.patchset, '1') |
| 1689 | self.assertTrue(items[1].live) |
| 1690 | |
| 1691 | self.assertEqual(items[2].change.number, '1') |
| 1692 | self.assertEqual(items[2].change.patchset, '1') |
| 1693 | self.assertTrue(items[2].live) |
| 1694 | |
| 1695 | # Add a new patchset to A |
| 1696 | A.addPatchset() |
| 1697 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 1698 | self.waitUntilSettled() |
| 1699 | |
| 1700 | # The live copy of A,1 should be gone, but the non-live and B |
| 1701 | # should continue, and we should have a new A,2 |
| 1702 | items = check_pipeline.getAllItems() |
| 1703 | self.assertEqual(len(items), 3) |
| 1704 | |
| 1705 | self.assertEqual(items[0].change.number, '1') |
| 1706 | self.assertEqual(items[0].change.patchset, '1') |
| 1707 | self.assertFalse(items[0].live) |
| 1708 | |
| 1709 | self.assertEqual(items[1].change.number, '2') |
| 1710 | self.assertEqual(items[1].change.patchset, '1') |
| 1711 | self.assertTrue(items[1].live) |
| 1712 | |
| 1713 | self.assertEqual(items[2].change.number, '1') |
| 1714 | self.assertEqual(items[2].change.patchset, '2') |
| 1715 | self.assertTrue(items[2].live) |
| 1716 | |
| 1717 | # Add a new patchset to B |
| 1718 | B.addPatchset() |
| 1719 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1720 | self.waitUntilSettled() |
| 1721 | |
| 1722 | # The live copy of B,1 should be gone, and it's non-live copy of A,1 |
| 1723 | # but we should have a new B,2 (still based on A,1) |
| 1724 | items = check_pipeline.getAllItems() |
| 1725 | self.assertEqual(len(items), 3) |
| 1726 | |
| 1727 | self.assertEqual(items[0].change.number, '1') |
| 1728 | self.assertEqual(items[0].change.patchset, '2') |
| 1729 | self.assertTrue(items[0].live) |
| 1730 | |
| 1731 | self.assertEqual(items[1].change.number, '1') |
| 1732 | self.assertEqual(items[1].change.patchset, '1') |
| 1733 | self.assertFalse(items[1].live) |
| 1734 | |
| 1735 | self.assertEqual(items[2].change.number, '2') |
| 1736 | self.assertEqual(items[2].change.patchset, '2') |
| 1737 | self.assertTrue(items[2].live) |
| 1738 | |
| 1739 | self.builds[0].release() |
| 1740 | self.waitUntilSettled() |
| 1741 | self.builds[0].release() |
| 1742 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1743 | self.launch_server.hold_jobs_in_build = False |
| 1744 | self.launch_server.release() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1745 | self.waitUntilSettled() |
| 1746 | |
| 1747 | self.assertEqual(A.reported, 1) |
| 1748 | self.assertEqual(B.reported, 1) |
| 1749 | self.assertEqual(self.history[0].result, 'ABORTED') |
| 1750 | self.assertEqual(self.history[0].changes, '1,1') |
| 1751 | self.assertEqual(self.history[1].result, 'ABORTED') |
| 1752 | self.assertEqual(self.history[1].changes, '1,1 2,1') |
| 1753 | self.assertEqual(self.history[2].result, 'SUCCESS') |
| 1754 | self.assertEqual(self.history[2].changes, '1,2') |
| 1755 | self.assertEqual(self.history[3].result, 'SUCCESS') |
| 1756 | self.assertEqual(self.history[3].changes, '1,1 2,2') |
| 1757 | |
| 1758 | def test_abandoned_gate(self): |
| 1759 | "Test that an abandoned change is dequeued from gate" |
| 1760 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1761 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1762 | |
| 1763 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1764 | A.addApproval('code-review', 2) |
| 1765 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1766 | self.waitUntilSettled() |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1767 | self.assertEqual(len(self.builds), 1, "One job being built (on hold)") |
| 1768 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 1769 | |
| 1770 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1771 | self.waitUntilSettled() |
| 1772 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1773 | self.launch_server.release('.*-merge') |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1774 | self.waitUntilSettled() |
| 1775 | |
Arie | 5b4048c | 2016-10-05 16:12:06 +0300 | [diff] [blame] | 1776 | self.assertBuilds([]) |
| 1777 | self.assertHistory([ |
| 1778 | dict(name='project-merge', result='ABORTED', changes='1,1')], |
| 1779 | ordered=False) |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1780 | self.assertEqual(A.reported, 1, |
| 1781 | "Abandoned gate change should report only start") |
| 1782 | |
| 1783 | def test_abandoned_check(self): |
| 1784 | "Test that an abandoned change is dequeued from check" |
| 1785 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1786 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1787 | |
| 1788 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1789 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
Paul Belanger | 18e5f63 | 2016-11-03 15:24:16 -0400 | [diff] [blame] | 1790 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 1791 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1792 | |
| 1793 | # Add two git-dependent changes |
| 1794 | B.setDependsOn(A, 1) |
| 1795 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1796 | self.waitUntilSettled() |
| 1797 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1798 | self.waitUntilSettled() |
| 1799 | # A live item, and a non-live/live pair |
| 1800 | items = check_pipeline.getAllItems() |
| 1801 | self.assertEqual(len(items), 3) |
| 1802 | |
| 1803 | self.assertEqual(items[0].change.number, '1') |
| 1804 | self.assertFalse(items[0].live) |
| 1805 | |
| 1806 | self.assertEqual(items[1].change.number, '2') |
| 1807 | self.assertTrue(items[1].live) |
| 1808 | |
| 1809 | self.assertEqual(items[2].change.number, '1') |
| 1810 | self.assertTrue(items[2].live) |
| 1811 | |
| 1812 | # Abandon A |
| 1813 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1814 | self.waitUntilSettled() |
| 1815 | |
| 1816 | # The live copy of A should be gone, but the non-live and B |
| 1817 | # should continue |
| 1818 | items = check_pipeline.getAllItems() |
| 1819 | self.assertEqual(len(items), 2) |
| 1820 | |
| 1821 | self.assertEqual(items[0].change.number, '1') |
| 1822 | self.assertFalse(items[0].live) |
| 1823 | |
| 1824 | self.assertEqual(items[1].change.number, '2') |
| 1825 | self.assertTrue(items[1].live) |
| 1826 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1827 | self.launch_server.hold_jobs_in_build = False |
| 1828 | self.launch_server.release() |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1829 | self.waitUntilSettled() |
| 1830 | |
| 1831 | self.assertEqual(len(self.history), 4) |
| 1832 | self.assertEqual(self.history[0].result, 'ABORTED', |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1833 | 'Build should have been aborted') |
| 1834 | self.assertEqual(A.reported, 0, "Abandoned change should not report") |
James E. Blair | ba43736 | 2015-02-07 11:41:52 -0800 | [diff] [blame] | 1835 | self.assertEqual(B.reported, 1, "Change should report") |
Antoine Musso | bd86a31 | 2014-01-08 14:51:33 +0100 | [diff] [blame] | 1836 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 1837 | @skip("Disabled for early v3 development") |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1838 | def test_abandoned_not_timer(self): |
| 1839 | "Test that an abandoned change does not cancel timer jobs" |
| 1840 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1841 | self.launch_server.hold_jobs_in_build = True |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1842 | |
| 1843 | # Start timer trigger - also org/project |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 1844 | self.updateConfigLayout( |
| 1845 | 'tests/fixtures/layout-idle.yaml') |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1846 | self.sched.reconfigure(self.config) |
| 1847 | self.registerJobs() |
| 1848 | # The pipeline triggers every second, so we should have seen |
| 1849 | # several by now. |
| 1850 | time.sleep(5) |
| 1851 | self.waitUntilSettled() |
| 1852 | # Stop queuing timer triggered jobs so that the assertions |
| 1853 | # below don't race against more jobs being queued. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 1854 | self.updateConfigLayout( |
| 1855 | 'tests/fixtures/layout-no-timer.yaml') |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1856 | self.sched.reconfigure(self.config) |
| 1857 | self.registerJobs() |
| 1858 | self.assertEqual(len(self.builds), 2, "Two timer jobs") |
| 1859 | |
| 1860 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1861 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1862 | self.waitUntilSettled() |
| 1863 | self.assertEqual(len(self.builds), 3, "One change plus two timer jobs") |
| 1864 | |
| 1865 | self.fake_gerrit.addEvent(A.getChangeAbandonedEvent()) |
| 1866 | self.waitUntilSettled() |
| 1867 | |
| 1868 | self.assertEqual(len(self.builds), 2, "Two timer jobs remain") |
| 1869 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1870 | self.launch_server.release() |
Steve Varnau | 7b78b31 | 2015-04-03 14:49:46 -0700 | [diff] [blame] | 1871 | self.waitUntilSettled() |
| 1872 | |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1873 | def test_zuul_url_return(self): |
| 1874 | "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] | 1875 | self.assertTrue(self.sched.config.has_option('merger', 'zuul_url')) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1876 | self.launch_server.hold_jobs_in_build = True |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1877 | |
| 1878 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1879 | A.addApproval('code-review', 2) |
| 1880 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1881 | self.waitUntilSettled() |
| 1882 | |
| 1883 | self.assertEqual(len(self.builds), 1) |
| 1884 | for build in self.builds: |
| 1885 | self.assertTrue('ZUUL_URL' in build.parameters) |
| 1886 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1887 | self.launch_server.hold_jobs_in_build = False |
| 1888 | self.launch_server.release() |
Arx Cruz | b1b010d | 2013-10-28 19:49:59 -0200 | [diff] [blame] | 1889 | self.waitUntilSettled() |
| 1890 | |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1891 | def test_new_patchset_dequeues_old_on_head(self): |
| 1892 | "Test that a new patchset causes the old to be dequeued (at head)" |
| 1893 | # D -> C (depends on B) -> B (depends on A) -> A -> M |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1894 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1895 | M = self.fake_gerrit.addFakeChange('org/project', 'master', 'M') |
| 1896 | M.setMerged() |
| 1897 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1898 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1899 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1900 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1901 | A.addApproval('code-review', 2) |
| 1902 | B.addApproval('code-review', 2) |
| 1903 | C.addApproval('code-review', 2) |
| 1904 | D.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1905 | |
| 1906 | C.setDependsOn(B, 1) |
| 1907 | B.setDependsOn(A, 1) |
| 1908 | A.setDependsOn(M, 1) |
| 1909 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1910 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 1911 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1912 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1913 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1914 | self.waitUntilSettled() |
| 1915 | |
| 1916 | A.addPatchset() |
| 1917 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 1918 | self.waitUntilSettled() |
| 1919 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1920 | self.launch_server.hold_jobs_in_build = False |
| 1921 | self.launch_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1922 | self.waitUntilSettled() |
| 1923 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1924 | self.assertEqual(A.data['status'], 'NEW') |
| 1925 | self.assertEqual(A.reported, 2) |
| 1926 | self.assertEqual(B.data['status'], 'NEW') |
| 1927 | self.assertEqual(B.reported, 2) |
| 1928 | self.assertEqual(C.data['status'], 'NEW') |
| 1929 | self.assertEqual(C.reported, 2) |
| 1930 | self.assertEqual(D.data['status'], 'MERGED') |
| 1931 | self.assertEqual(D.reported, 2) |
| 1932 | self.assertEqual(len(self.history), 7) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1933 | |
| 1934 | def test_new_patchset_dequeues_old_without_dependents(self): |
| 1935 | "Test that a new patchset causes only the old to be dequeued" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1936 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1937 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1938 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1939 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1940 | A.addApproval('code-review', 2) |
| 1941 | B.addApproval('code-review', 2) |
| 1942 | C.addApproval('code-review', 2) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1943 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1944 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 1945 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 1946 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1947 | self.waitUntilSettled() |
| 1948 | |
| 1949 | B.addPatchset() |
| 1950 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1951 | self.waitUntilSettled() |
| 1952 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1953 | self.launch_server.hold_jobs_in_build = False |
| 1954 | self.launch_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1955 | self.waitUntilSettled() |
| 1956 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1957 | self.assertEqual(A.data['status'], 'MERGED') |
| 1958 | self.assertEqual(A.reported, 2) |
| 1959 | self.assertEqual(B.data['status'], 'NEW') |
| 1960 | self.assertEqual(B.reported, 2) |
| 1961 | self.assertEqual(C.data['status'], 'MERGED') |
| 1962 | self.assertEqual(C.reported, 2) |
| 1963 | self.assertEqual(len(self.history), 9) |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1964 | |
| 1965 | def test_new_patchset_dequeues_old_independent_queue(self): |
| 1966 | "Test that a new patchset causes the old to be dequeued (independent)" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1967 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1968 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 1969 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 1970 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 1971 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 1972 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 1973 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 1974 | self.waitUntilSettled() |
| 1975 | |
| 1976 | B.addPatchset() |
| 1977 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(2)) |
| 1978 | self.waitUntilSettled() |
| 1979 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 1980 | self.launch_server.hold_jobs_in_build = False |
| 1981 | self.launch_server.release() |
James E. Blair | 2fa5096 | 2013-01-30 21:50:41 -0800 | [diff] [blame] | 1982 | self.waitUntilSettled() |
| 1983 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 1984 | self.assertEqual(A.data['status'], 'NEW') |
| 1985 | self.assertEqual(A.reported, 1) |
| 1986 | self.assertEqual(B.data['status'], 'NEW') |
| 1987 | self.assertEqual(B.reported, 1) |
| 1988 | self.assertEqual(C.data['status'], 'NEW') |
| 1989 | self.assertEqual(C.reported, 1) |
| 1990 | self.assertEqual(len(self.history), 10) |
| 1991 | self.assertEqual(self.countJobResults(self.history, 'ABORTED'), 1) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 1992 | |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 1993 | def test_noop_job(self): |
| 1994 | "Test that the internal noop job works" |
| 1995 | A = self.fake_gerrit.addFakeChange('org/noop-project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 1996 | A.addApproval('code-review', 2) |
| 1997 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 1998 | self.waitUntilSettled() |
| 1999 | |
| 2000 | self.assertEqual(len(self.gearman_server.getQueue()), 0) |
| 2001 | self.assertTrue(self.sched._areAllBuildsComplete()) |
| 2002 | self.assertEqual(len(self.history), 0) |
| 2003 | self.assertEqual(A.data['status'], 'MERGED') |
| 2004 | self.assertEqual(A.reported, 2) |
| 2005 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2006 | @skip("Disabled for early v3 development") |
Evgeny Antyshev | d6e546c | 2015-06-11 15:13:57 +0000 | [diff] [blame] | 2007 | def test_no_job_project(self): |
| 2008 | "Test that reports with no jobs don't get sent" |
| 2009 | A = self.fake_gerrit.addFakeChange('org/no-jobs-project', |
| 2010 | 'master', 'A') |
| 2011 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2012 | self.waitUntilSettled() |
| 2013 | |
| 2014 | # Change wasn't reported to |
| 2015 | self.assertEqual(A.reported, False) |
| 2016 | |
| 2017 | # Check queue is empty afterwards |
| 2018 | check_pipeline = self.sched.layout.pipelines['check'] |
| 2019 | items = check_pipeline.getAllItems() |
| 2020 | self.assertEqual(len(items), 0) |
| 2021 | |
| 2022 | self.assertEqual(len(self.history), 0) |
| 2023 | |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2024 | def test_zuul_refs(self): |
| 2025 | "Test that zuul refs exist and have the right changes" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2026 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2027 | M1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'M1') |
| 2028 | M1.setMerged() |
| 2029 | M2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'M2') |
| 2030 | M2.setMerged() |
| 2031 | |
| 2032 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2033 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 2034 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 2035 | D = self.fake_gerrit.addFakeChange('org/project2', 'master', 'D') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2036 | A.addApproval('code-review', 2) |
| 2037 | B.addApproval('code-review', 2) |
| 2038 | C.addApproval('code-review', 2) |
| 2039 | D.addApproval('code-review', 2) |
| 2040 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 2041 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 2042 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
| 2043 | self.fake_gerrit.addEvent(D.addApproval('approved', 1)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2044 | |
| 2045 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2046 | self.launch_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2047 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2048 | self.launch_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2049 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2050 | self.launch_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2051 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2052 | self.launch_server.release('.*-merge') |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2053 | self.waitUntilSettled() |
| 2054 | |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2055 | a_zref = b_zref = c_zref = d_zref = None |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2056 | a_build = b_build = c_build = d_build = None |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 2057 | for x in self.builds: |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2058 | if x.parameters['ZUUL_CHANGE'] == '3': |
| 2059 | a_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2060 | a_build = x |
| 2061 | elif x.parameters['ZUUL_CHANGE'] == '4': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2062 | b_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2063 | b_build = x |
| 2064 | elif x.parameters['ZUUL_CHANGE'] == '5': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2065 | c_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2066 | c_build = x |
| 2067 | elif x.parameters['ZUUL_CHANGE'] == '6': |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2068 | d_zref = x.parameters['ZUUL_REF'] |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2069 | d_build = x |
| 2070 | if a_build and b_build and c_build and d_build: |
| 2071 | break |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2072 | |
| 2073 | # There are... four... refs. |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2074 | self.assertIsNotNone(a_zref) |
| 2075 | self.assertIsNotNone(b_zref) |
| 2076 | self.assertIsNotNone(c_zref) |
| 2077 | self.assertIsNotNone(d_zref) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2078 | |
| 2079 | # And they should all be different |
| 2080 | refs = set([a_zref, b_zref, c_zref, d_zref]) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2081 | self.assertEqual(len(refs), 4) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2082 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2083 | # should have a, not b, and should not be in project2 |
| 2084 | self.assertTrue(a_build.hasChanges(A)) |
| 2085 | self.assertFalse(a_build.hasChanges(B, M2)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2086 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2087 | # should have a and b, and should not be in project2 |
| 2088 | self.assertTrue(b_build.hasChanges(A, B)) |
| 2089 | self.assertFalse(b_build.hasChanges(M2)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2090 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2091 | # should have a and b in 1, c in 2 |
| 2092 | self.assertTrue(c_build.hasChanges(A, B, C)) |
| 2093 | self.assertFalse(c_build.hasChanges(D)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2094 | |
Clint Byrum | 3343e3e | 2016-11-15 16:05:03 -0800 | [diff] [blame] | 2095 | # should have a and b in 1, c and d in 2 |
| 2096 | self.assertTrue(d_build.hasChanges(A, B, C, D)) |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2097 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2098 | self.launch_server.hold_jobs_in_build = False |
| 2099 | self.launch_server.release() |
James E. Blair | 7d0dedc | 2013-02-21 17:26:09 -0800 | [diff] [blame] | 2100 | self.waitUntilSettled() |
| 2101 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2102 | self.assertEqual(A.data['status'], 'MERGED') |
| 2103 | self.assertEqual(A.reported, 2) |
| 2104 | self.assertEqual(B.data['status'], 'MERGED') |
| 2105 | self.assertEqual(B.reported, 2) |
| 2106 | self.assertEqual(C.data['status'], 'MERGED') |
| 2107 | self.assertEqual(C.reported, 2) |
| 2108 | self.assertEqual(D.data['status'], 'MERGED') |
| 2109 | self.assertEqual(D.reported, 2) |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2110 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2111 | @skip("Disabled for early v3 development") |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2112 | def test_rerun_on_error(self): |
| 2113 | "Test that if a worker fails to run a job, it is run again" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2114 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2115 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2116 | A.addApproval('code-review', 2) |
| 2117 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2118 | self.waitUntilSettled() |
| 2119 | |
| 2120 | self.builds[0].run_error = True |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2121 | self.launch_server.hold_jobs_in_build = False |
| 2122 | self.launch_server.release() |
James E. Blair | 4a28a88 | 2013-08-23 15:17:33 -0700 | [diff] [blame] | 2123 | self.waitUntilSettled() |
| 2124 | self.assertEqual(self.countJobResults(self.history, 'RUN_ERROR'), 1) |
| 2125 | self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3) |
| 2126 | |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2127 | def test_statsd(self): |
| 2128 | "Test each of the statsd methods used in the scheduler" |
| 2129 | import extras |
| 2130 | statsd = extras.try_import('statsd.statsd') |
| 2131 | statsd.incr('test-incr') |
| 2132 | statsd.timing('test-timing', 3) |
Alex Gaynor | 813d39b | 2014-05-17 16:17:16 -0700 | [diff] [blame] | 2133 | statsd.gauge('test-gauge', 12) |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2134 | self.assertReportedStat('test-incr', '1|c') |
| 2135 | self.assertReportedStat('test-timing', '3|ms') |
Alex Gaynor | 813d39b | 2014-05-17 16:17:16 -0700 | [diff] [blame] | 2136 | self.assertReportedStat('test-gauge', '12|g') |
James E. Blair | 412e558 | 2013-04-22 15:50:12 -0700 | [diff] [blame] | 2137 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2138 | @skip("Disabled for early v3 development") |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2139 | def test_stuck_job_cleanup(self): |
| 2140 | "Test that pending jobs are cleaned up if removed from layout" |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 2141 | # This job won't be registered at startup because it is not in |
| 2142 | # the standard layout, but we need it to already be registerd |
| 2143 | # for when we reconfigure, as that is when Zuul will attempt |
| 2144 | # to run the new job. |
| 2145 | self.worker.registerFunction('build:gate-noop') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2146 | self.gearman_server.hold_jobs_in_queue = True |
| 2147 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2148 | A.addApproval('code-review', 2) |
| 2149 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2150 | self.waitUntilSettled() |
| 2151 | self.assertEqual(len(self.gearman_server.getQueue()), 1) |
| 2152 | |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2153 | self.updateConfigLayout( |
| 2154 | 'tests/fixtures/layout-no-jobs.yaml') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2155 | self.sched.reconfigure(self.config) |
| 2156 | self.waitUntilSettled() |
| 2157 | |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 2158 | self.gearman_server.release('gate-noop') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2159 | self.waitUntilSettled() |
| 2160 | self.assertEqual(len(self.gearman_server.getQueue()), 0) |
| 2161 | self.assertTrue(self.sched._areAllBuildsComplete()) |
| 2162 | |
| 2163 | self.assertEqual(len(self.history), 1) |
James E. Blair | 18c6444 | 2014-03-18 10:14:45 -0700 | [diff] [blame] | 2164 | self.assertEqual(self.history[0].name, 'gate-noop') |
James E. Blair | dad5225 | 2014-02-07 16:59:17 -0800 | [diff] [blame] | 2165 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2166 | |
James E. Blair | 879dafb | 2015-07-17 14:04:49 -0700 | [diff] [blame] | 2167 | def test_file_head(self): |
| 2168 | # This is a regression test for an observed bug. A change |
| 2169 | # with a file named "HEAD" in the root directory of the repo |
| 2170 | # was processed by a merger. It then was unable to reset the |
| 2171 | # repo because of: |
| 2172 | # GitCommandError: 'git reset --hard HEAD' returned |
| 2173 | # with exit code 128 |
| 2174 | # stderr: 'fatal: ambiguous argument 'HEAD': both revision |
| 2175 | # and filename |
| 2176 | # Use '--' to separate filenames from revisions' |
| 2177 | |
| 2178 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
Paul Belanger | a91095f | 2016-11-04 19:28:48 -0400 | [diff] [blame] | 2179 | A.addPatchset({'HEAD': ''}) |
James E. Blair | 879dafb | 2015-07-17 14:04:49 -0700 | [diff] [blame] | 2180 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 2181 | |
| 2182 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 2183 | self.waitUntilSettled() |
| 2184 | |
| 2185 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 2186 | self.waitUntilSettled() |
| 2187 | |
| 2188 | self.assertIn('Build succeeded', A.messages[0]) |
| 2189 | self.assertIn('Build succeeded', B.messages[0]) |
| 2190 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2191 | @skip("Disabled for early v3 development") |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2192 | def test_file_jobs(self): |
| 2193 | "Test that file jobs run only when appropriate" |
| 2194 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2195 | A.addPatchset(['pip-requires']) |
| 2196 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2197 | A.addApproval('code-review', 2) |
| 2198 | B.addApproval('code-review', 2) |
| 2199 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 2200 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2201 | self.waitUntilSettled() |
| 2202 | |
Monty Taylor | 6bef8ef | 2013-06-02 08:17:12 -0400 | [diff] [blame] | 2203 | testfile_jobs = [x for x in self.history |
James E. Blair | 70c7158 | 2013-03-06 08:50:50 -0800 | [diff] [blame] | 2204 | if x.name == 'project-testfile'] |
| 2205 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2206 | self.assertEqual(len(testfile_jobs), 1) |
| 2207 | self.assertEqual(testfile_jobs[0].changes, '1,2') |
| 2208 | self.assertEqual(A.data['status'], 'MERGED') |
| 2209 | self.assertEqual(A.reported, 2) |
| 2210 | self.assertEqual(B.data['status'], 'MERGED') |
| 2211 | self.assertEqual(B.reported, 2) |
James E. Blair | 3c5e5b5 | 2013-04-26 11:17:03 -0700 | [diff] [blame] | 2212 | |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2213 | def _test_irrelevant_files_jobs(self, should_skip): |
| 2214 | "Test that jobs with irrelevant-files filter run only when appropriate" |
| 2215 | self.updateConfigLayout('layout-irrelevant-files') |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2216 | self.sched.reconfigure(self.config) |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2217 | |
| 2218 | if should_skip: |
| 2219 | files = {'ignoreme': 'ignored\n'} |
| 2220 | else: |
| 2221 | files = {'respectme': 'please!\n'} |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2222 | |
| 2223 | change = self.fake_gerrit.addFakeChange('org/project', |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2224 | 'master', |
| 2225 | 'test irrelevant-files', |
| 2226 | files=files) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2227 | self.fake_gerrit.addEvent(change.getPatchsetCreatedEvent(1)) |
| 2228 | self.waitUntilSettled() |
| 2229 | |
| 2230 | tested_change_ids = [x.changes[0] for x in self.history |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2231 | if x.name == 'project-test-irrelevant-files'] |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2232 | |
| 2233 | if should_skip: |
| 2234 | self.assertEqual([], tested_change_ids) |
| 2235 | else: |
| 2236 | self.assertIn(change.data['number'], tested_change_ids) |
| 2237 | |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2238 | def test_irrelevant_files_match_skips_job(self): |
| 2239 | self._test_irrelevant_files_jobs(should_skip=True) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2240 | |
Clint Byrum | 3ee39f3 | 2016-11-17 23:45:07 -0800 | [diff] [blame] | 2241 | def test_irrelevant_files_no_match_runs_job(self): |
| 2242 | self._test_irrelevant_files_jobs(should_skip=False) |
Maru Newby | 3fe5f85 | 2015-01-13 04:22:14 +0000 | [diff] [blame] | 2243 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2244 | @skip("Disabled for early v3 development") |
James E. Blair | 3c5e5b5 | 2013-04-26 11:17:03 -0700 | [diff] [blame] | 2245 | def test_test_config(self): |
| 2246 | "Test that we can test the config" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2247 | self.sched.testConfig(self.config.get('zuul', 'tenant_config'), |
Joshua Hesketh | 352264b | 2015-08-11 23:42:08 +1000 | [diff] [blame] | 2248 | self.connections) |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 2249 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2250 | @skip("Disabled for early v3 development") |
James E. Blair | c8a1e05 | 2014-02-25 09:29:26 -0800 | [diff] [blame] | 2251 | def test_queue_names(self): |
| 2252 | "Test shared change queue names" |
| 2253 | project1 = self.sched.layout.projects['org/project1'] |
| 2254 | project2 = self.sched.layout.projects['org/project2'] |
| 2255 | q1 = self.sched.layout.pipelines['gate'].getQueue(project1) |
| 2256 | q2 = self.sched.layout.pipelines['gate'].getQueue(project2) |
| 2257 | self.assertEqual(q1.name, 'integration') |
| 2258 | self.assertEqual(q2.name, 'integration') |
| 2259 | |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2260 | self.updateConfigLayout( |
| 2261 | 'tests/fixtures/layout-bad-queue.yaml') |
James E. Blair | c8a1e05 | 2014-02-25 09:29:26 -0800 | [diff] [blame] | 2262 | with testtools.ExpectedException( |
| 2263 | Exception, "More than one name assigned to change queue"): |
| 2264 | self.sched.reconfigure(self.config) |
| 2265 | |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2266 | def test_queue_precedence(self): |
| 2267 | "Test that queue precedence works" |
| 2268 | |
| 2269 | self.gearman_server.hold_jobs_in_queue = True |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2270 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2271 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2272 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2273 | A.addApproval('code-review', 2) |
| 2274 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2275 | |
| 2276 | self.waitUntilSettled() |
| 2277 | self.gearman_server.hold_jobs_in_queue = False |
| 2278 | self.gearman_server.release() |
| 2279 | self.waitUntilSettled() |
| 2280 | |
James E. Blair | 8de58bd | 2013-07-18 16:23:33 -0700 | [diff] [blame] | 2281 | # Run one build at a time to ensure non-race order: |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 2282 | self.orderedRelease() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2283 | self.launch_server.hold_jobs_in_build = False |
James E. Blair | 8de58bd | 2013-07-18 16:23:33 -0700 | [diff] [blame] | 2284 | self.waitUntilSettled() |
| 2285 | |
James E. Blair | 64ed6f2 | 2013-07-10 14:07:23 -0700 | [diff] [blame] | 2286 | self.log.debug(self.history) |
| 2287 | self.assertEqual(self.history[0].pipeline, 'gate') |
| 2288 | self.assertEqual(self.history[1].pipeline, 'check') |
| 2289 | self.assertEqual(self.history[2].pipeline, 'gate') |
| 2290 | self.assertEqual(self.history[3].pipeline, 'gate') |
| 2291 | self.assertEqual(self.history[4].pipeline, 'check') |
| 2292 | self.assertEqual(self.history[5].pipeline, 'check') |
| 2293 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2294 | @skip("Disabled for early v3 development") |
Clark Boylan | a5edbe4 | 2014-06-03 16:39:10 -0700 | [diff] [blame] | 2295 | def test_json_status(self): |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2296 | "Test that we can retrieve JSON status info" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2297 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2298 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2299 | A.addApproval('code-review', 2) |
| 2300 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2301 | self.waitUntilSettled() |
| 2302 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2303 | self.launch_server.release('project-merge') |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2304 | self.waitUntilSettled() |
| 2305 | |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2306 | port = self.webapp.server.socket.getsockname()[1] |
| 2307 | |
Morgan Fainberg | 293f7f8 | 2016-05-30 14:01:22 -0700 | [diff] [blame] | 2308 | req = urllib.request.Request("http://localhost:%s/status.json" % port) |
| 2309 | f = urllib.request.urlopen(req) |
Clark Boylan | aa4f2e7 | 2014-06-03 21:22:40 -0700 | [diff] [blame] | 2310 | headers = f.info() |
| 2311 | self.assertIn('Content-Length', headers) |
| 2312 | self.assertIn('Content-Type', headers) |
Sachi King | dc963fc | 2016-03-23 16:00:33 +1100 | [diff] [blame] | 2313 | self.assertIsNotNone(re.match('^application/json(; charset=UTF-8)?$', |
| 2314 | headers['Content-Type'])) |
Timo Tijhof | 0ebd293 | 2015-04-02 12:11:21 +0100 | [diff] [blame] | 2315 | self.assertIn('Access-Control-Allow-Origin', headers) |
| 2316 | self.assertIn('Cache-Control', headers) |
Clark Boylan | aa4f2e7 | 2014-06-03 21:22:40 -0700 | [diff] [blame] | 2317 | self.assertIn('Last-Modified', headers) |
Timo Tijhof | 0ebd293 | 2015-04-02 12:11:21 +0100 | [diff] [blame] | 2318 | self.assertIn('Expires', headers) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2319 | data = f.read() |
| 2320 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2321 | self.launch_server.hold_jobs_in_build = False |
| 2322 | self.launch_server.release() |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2323 | self.waitUntilSettled() |
| 2324 | |
| 2325 | data = json.loads(data) |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2326 | status_jobs = [] |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2327 | for p in data['pipelines']: |
| 2328 | for q in p['change_queues']: |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 2329 | if p['name'] in ['gate', 'conflict']: |
Clark Boylan | af2476f | 2014-01-23 14:47:36 -0800 | [diff] [blame] | 2330 | self.assertEqual(q['window'], 20) |
| 2331 | else: |
| 2332 | self.assertEqual(q['window'], 0) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2333 | for head in q['heads']: |
| 2334 | for change in head: |
Clark Boylan | af2476f | 2014-01-23 14:47:36 -0800 | [diff] [blame] | 2335 | self.assertTrue(change['active']) |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2336 | self.assertEqual(change['id'], '1,1') |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2337 | for job in change['jobs']: |
James E. Blair | b7273ef | 2016-04-19 08:58:51 -0700 | [diff] [blame] | 2338 | status_jobs.append(job) |
| 2339 | self.assertEqual('project-merge', status_jobs[0]['name']) |
| 2340 | self.assertEqual('https://server/job/project-merge/0/', |
| 2341 | status_jobs[0]['url']) |
| 2342 | self.assertEqual('http://logs.example.com/1/1/gate/project-merge/0', |
| 2343 | status_jobs[0]['report_url']) |
| 2344 | |
| 2345 | self.assertEqual('project-test1', status_jobs[1]['name']) |
| 2346 | self.assertEqual('https://server/job/project-test1/1/', |
| 2347 | status_jobs[1]['url']) |
| 2348 | self.assertEqual('http://logs.example.com/1/1/gate/project-test1/1', |
| 2349 | status_jobs[1]['report_url']) |
| 2350 | |
| 2351 | self.assertEqual('project-test2', status_jobs[2]['name']) |
| 2352 | self.assertEqual('https://server/job/project-test2/2/', |
| 2353 | status_jobs[2]['url']) |
| 2354 | self.assertEqual('http://logs.example.com/1/1/gate/project-test2/2', |
| 2355 | status_jobs[2]['report_url']) |
James E. Blair | 1843a55 | 2013-07-03 14:19:52 -0700 | [diff] [blame] | 2356 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2357 | @skip("Disabled for early v3 development") |
James E. Blair | c3d428e | 2013-12-03 15:06:48 -0800 | [diff] [blame] | 2358 | def test_merging_queues(self): |
| 2359 | "Test that transitively-connected change queues are merged" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2360 | self.updateConfigLayout( |
| 2361 | 'tests/fixtures/layout-merge-queues.yaml') |
James E. Blair | c3d428e | 2013-12-03 15:06:48 -0800 | [diff] [blame] | 2362 | self.sched.reconfigure(self.config) |
| 2363 | self.assertEqual(len(self.sched.layout.pipelines['gate'].queues), 1) |
| 2364 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2365 | @skip("Disabled for early v3 development") |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2366 | def test_mutex(self): |
| 2367 | "Test job mutexes" |
| 2368 | self.config.set('zuul', 'layout_config', |
| 2369 | 'tests/fixtures/layout-mutex.yaml') |
| 2370 | self.sched.reconfigure(self.config) |
| 2371 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2372 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2373 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2374 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 2375 | self.assertFalse('test-mutex' in self.sched.mutex.mutexes) |
| 2376 | |
| 2377 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2378 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 2379 | self.waitUntilSettled() |
| 2380 | self.assertEqual(len(self.builds), 3) |
| 2381 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 2382 | self.assertEqual(self.builds[1].name, 'mutex-one') |
| 2383 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 2384 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2385 | self.launch_server.release('mutex-one') |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2386 | self.waitUntilSettled() |
| 2387 | |
| 2388 | self.assertEqual(len(self.builds), 3) |
| 2389 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 2390 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 2391 | self.assertEqual(self.builds[2].name, 'mutex-two') |
| 2392 | self.assertTrue('test-mutex' in self.sched.mutex.mutexes) |
| 2393 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2394 | self.launch_server.release('mutex-two') |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2395 | self.waitUntilSettled() |
| 2396 | |
| 2397 | self.assertEqual(len(self.builds), 3) |
| 2398 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 2399 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 2400 | self.assertEqual(self.builds[2].name, 'mutex-one') |
| 2401 | self.assertTrue('test-mutex' in self.sched.mutex.mutexes) |
| 2402 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2403 | self.launch_server.release('mutex-one') |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2404 | self.waitUntilSettled() |
| 2405 | |
| 2406 | self.assertEqual(len(self.builds), 3) |
| 2407 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 2408 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 2409 | self.assertEqual(self.builds[2].name, 'mutex-two') |
| 2410 | self.assertTrue('test-mutex' in self.sched.mutex.mutexes) |
| 2411 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2412 | self.launch_server.release('mutex-two') |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2413 | self.waitUntilSettled() |
| 2414 | |
| 2415 | self.assertEqual(len(self.builds), 2) |
| 2416 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 2417 | self.assertEqual(self.builds[1].name, 'project-test1') |
| 2418 | self.assertFalse('test-mutex' in self.sched.mutex.mutexes) |
| 2419 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2420 | self.launch_server.hold_jobs_in_build = False |
| 2421 | self.launch_server.release() |
James E. Blair | af17a97 | 2016-02-03 15:07:18 -0800 | [diff] [blame] | 2422 | |
| 2423 | self.waitUntilSettled() |
| 2424 | self.assertEqual(len(self.builds), 0) |
| 2425 | |
| 2426 | self.assertEqual(A.reported, 1) |
| 2427 | self.assertEqual(B.reported, 1) |
| 2428 | self.assertFalse('test-mutex' in self.sched.mutex.mutexes) |
| 2429 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2430 | @skip("Disabled for early v3 development") |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 2431 | def test_node_label(self): |
| 2432 | "Test that a job runs on a specific node label" |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 2433 | self.worker.registerFunction('build:node-project-test1:debian') |
| 2434 | |
| 2435 | A = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2436 | A.addApproval('code-review', 2) |
| 2437 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 1f4c2bb | 2013-04-26 08:40:46 -0700 | [diff] [blame] | 2438 | self.waitUntilSettled() |
James E. Blair | 4ca985f | 2013-05-30 12:27:43 -0700 | [diff] [blame] | 2439 | |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2440 | self.assertIsNone(self.getJobFromHistory('node-project-merge').node) |
| 2441 | self.assertEqual(self.getJobFromHistory('node-project-test1').node, |
| 2442 | 'debian') |
| 2443 | self.assertIsNone(self.getJobFromHistory('node-project-test2').node) |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2444 | |
| 2445 | def test_live_reconfiguration(self): |
| 2446 | "Test that live reconfiguration works" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2447 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2448 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2449 | A.addApproval('code-review', 2) |
| 2450 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2451 | self.waitUntilSettled() |
| 2452 | |
| 2453 | self.sched.reconfigure(self.config) |
| 2454 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2455 | self.launch_server.hold_jobs_in_build = False |
| 2456 | self.launch_server.release() |
James E. Blair | cdccd97 | 2013-07-01 12:10:22 -0700 | [diff] [blame] | 2457 | self.waitUntilSettled() |
Monty Taylor | 98f0f3e | 2013-07-06 16:02:31 -0400 | [diff] [blame] | 2458 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2459 | 'SUCCESS') |
| 2460 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2461 | 'SUCCESS') |
| 2462 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2463 | 'SUCCESS') |
| 2464 | self.assertEqual(A.data['status'], 'MERGED') |
| 2465 | self.assertEqual(A.reported, 2) |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2466 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2467 | @skip("Disabled for early v3 development") |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2468 | def test_live_reconfiguration_merge_conflict(self): |
| 2469 | # A real-world bug: a change in a gate queue has a merge |
| 2470 | # conflict and a job is added to its project while it's |
| 2471 | # sitting in the queue. The job gets added to the change and |
| 2472 | # enqueued and the change gets stuck. |
| 2473 | self.worker.registerFunction('build:project-test3') |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2474 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2475 | |
| 2476 | # This change is fine. It's here to stop the queue long |
| 2477 | # enough for the next change to be subject to the |
| 2478 | # reconfiguration, as well as to provide a conflict for the |
| 2479 | # next change. This change will succeed and merge. |
| 2480 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2481 | A.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2482 | A.addApproval('code-review', 2) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2483 | |
| 2484 | # This change will be in merge conflict. During the |
| 2485 | # reconfiguration, we will add a job. We want to make sure |
| 2486 | # that doesn't cause it to get stuck. |
| 2487 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 2488 | B.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2489 | B.addApproval('code-review', 2) |
James E. Blair | 4eb21fa | 2015-07-27 14:56:47 -0700 | [diff] [blame] | 2490 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2491 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 2492 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2493 | |
| 2494 | self.waitUntilSettled() |
| 2495 | |
| 2496 | # No jobs have run yet |
| 2497 | self.assertEqual(A.data['status'], 'NEW') |
| 2498 | self.assertEqual(A.reported, 1) |
| 2499 | self.assertEqual(B.data['status'], 'NEW') |
| 2500 | self.assertEqual(B.reported, 1) |
| 2501 | self.assertEqual(len(self.history), 0) |
| 2502 | |
| 2503 | # Add the "project-test3" job. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2504 | self.updateConfigLayout( |
| 2505 | 'tests/fixtures/layout-live-reconfiguration-add-job.yaml') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2506 | self.sched.reconfigure(self.config) |
| 2507 | self.waitUntilSettled() |
| 2508 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2509 | self.launch_server.hold_jobs_in_build = False |
| 2510 | self.launch_server.release() |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2511 | self.waitUntilSettled() |
| 2512 | |
| 2513 | self.assertEqual(A.data['status'], 'MERGED') |
| 2514 | self.assertEqual(A.reported, 2) |
| 2515 | self.assertEqual(B.data['status'], 'NEW') |
| 2516 | self.assertEqual(B.reported, 2) |
| 2517 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2518 | 'SUCCESS') |
| 2519 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2520 | 'SUCCESS') |
| 2521 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2522 | 'SUCCESS') |
| 2523 | self.assertEqual(self.getJobFromHistory('project-test3').result, |
| 2524 | 'SUCCESS') |
| 2525 | self.assertEqual(len(self.history), 4) |
| 2526 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2527 | @skip("Disabled for early v3 development") |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2528 | def test_live_reconfiguration_failed_root(self): |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2529 | # An extrapolation of test_live_reconfiguration_merge_conflict |
| 2530 | # that tests a job added to a job tree with a failed root does |
| 2531 | # not run. |
| 2532 | self.worker.registerFunction('build:project-test3') |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2533 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2534 | |
| 2535 | # This change is fine. It's here to stop the queue long |
| 2536 | # enough for the next change to be subject to the |
| 2537 | # reconfiguration. This change will succeed and merge. |
| 2538 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2539 | A.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2540 | A.addApproval('code-review', 2) |
| 2541 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2542 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2543 | self.launch_server.release('.*-merge') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2544 | self.waitUntilSettled() |
| 2545 | |
| 2546 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2547 | self.launch_server.failJob('project-merge', B) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2548 | B.addApproval('code-review', 2) |
| 2549 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2550 | self.waitUntilSettled() |
| 2551 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2552 | self.launch_server.release('.*-merge') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2553 | self.waitUntilSettled() |
| 2554 | |
| 2555 | # Both -merge jobs have run, but no others. |
| 2556 | self.assertEqual(A.data['status'], 'NEW') |
| 2557 | self.assertEqual(A.reported, 1) |
| 2558 | self.assertEqual(B.data['status'], 'NEW') |
| 2559 | self.assertEqual(B.reported, 1) |
| 2560 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2561 | self.assertEqual(self.history[0].name, 'project-merge') |
| 2562 | self.assertEqual(self.history[1].result, 'FAILURE') |
| 2563 | self.assertEqual(self.history[1].name, 'project-merge') |
| 2564 | self.assertEqual(len(self.history), 2) |
| 2565 | |
| 2566 | # Add the "project-test3" job. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2567 | self.updateConfigLayout( |
| 2568 | 'tests/fixtures/layout-live-reconfiguration-add-job.yaml') |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2569 | self.sched.reconfigure(self.config) |
| 2570 | self.waitUntilSettled() |
| 2571 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2572 | self.launch_server.hold_jobs_in_build = False |
| 2573 | self.launch_server.release() |
James E. Blair | 6bc782d | 2015-07-17 16:20:21 -0700 | [diff] [blame] | 2574 | self.waitUntilSettled() |
| 2575 | |
| 2576 | self.assertEqual(A.data['status'], 'MERGED') |
| 2577 | self.assertEqual(A.reported, 2) |
| 2578 | self.assertEqual(B.data['status'], 'NEW') |
| 2579 | self.assertEqual(B.reported, 2) |
| 2580 | self.assertEqual(self.history[0].result, 'SUCCESS') |
| 2581 | self.assertEqual(self.history[0].name, 'project-merge') |
| 2582 | self.assertEqual(self.history[1].result, 'FAILURE') |
| 2583 | self.assertEqual(self.history[1].name, 'project-merge') |
| 2584 | self.assertEqual(self.history[2].result, 'SUCCESS') |
| 2585 | self.assertEqual(self.history[3].result, 'SUCCESS') |
| 2586 | self.assertEqual(self.history[4].result, 'SUCCESS') |
| 2587 | self.assertEqual(len(self.history), 5) |
| 2588 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2589 | @skip("Disabled for early v3 development") |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2590 | def test_live_reconfiguration_failed_job(self): |
| 2591 | # Test that a change with a removed failing job does not |
| 2592 | # disrupt reconfiguration. If a change has a failed job and |
| 2593 | # that job is removed during a reconfiguration, we observed a |
| 2594 | # bug where the code to re-set build statuses would run on |
| 2595 | # that build and raise an exception because the job no longer |
| 2596 | # existed. |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2597 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2598 | |
| 2599 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2600 | |
| 2601 | # This change will fail and later be removed by the reconfiguration. |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2602 | self.launch_server.failJob('project-test1', A) |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2603 | |
| 2604 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2605 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2606 | self.launch_server.release('.*-merge') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2607 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2608 | self.launch_server.release('project-test1') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2609 | self.waitUntilSettled() |
| 2610 | |
| 2611 | self.assertEqual(A.data['status'], 'NEW') |
| 2612 | self.assertEqual(A.reported, 0) |
| 2613 | |
| 2614 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2615 | 'SUCCESS') |
| 2616 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2617 | 'FAILURE') |
| 2618 | self.assertEqual(len(self.history), 2) |
| 2619 | |
| 2620 | # Remove the test1 job. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2621 | self.updateConfigLayout( |
| 2622 | 'tests/fixtures/layout-live-reconfiguration-failed-job.yaml') |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2623 | self.sched.reconfigure(self.config) |
| 2624 | self.waitUntilSettled() |
| 2625 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2626 | self.launch_server.hold_jobs_in_build = False |
| 2627 | self.launch_server.release() |
James E. Blair | 400e8fd | 2015-07-30 17:44:45 -0700 | [diff] [blame] | 2628 | self.waitUntilSettled() |
| 2629 | |
| 2630 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2631 | 'SUCCESS') |
| 2632 | self.assertEqual(self.getJobFromHistory('project-testfile').result, |
| 2633 | 'SUCCESS') |
| 2634 | self.assertEqual(len(self.history), 4) |
| 2635 | |
| 2636 | self.assertEqual(A.data['status'], 'NEW') |
| 2637 | self.assertEqual(A.reported, 1) |
| 2638 | self.assertIn('Build succeeded', A.messages[0]) |
| 2639 | # Ensure the removed job was not included in the report. |
| 2640 | self.assertNotIn('project-test1', A.messages[0]) |
| 2641 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2642 | @skip("Disabled for early v3 development") |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2643 | def test_live_reconfiguration_shared_queue(self): |
| 2644 | # Test that a change with a failing job which was removed from |
| 2645 | # this project but otherwise still exists in the system does |
| 2646 | # not disrupt reconfiguration. |
| 2647 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2648 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2649 | |
| 2650 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2651 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2652 | self.launch_server.failJob('project1-project2-integration', A) |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2653 | |
| 2654 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2655 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2656 | self.launch_server.release('.*-merge') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2657 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2658 | self.launch_server.release('project1-project2-integration') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2659 | self.waitUntilSettled() |
| 2660 | |
| 2661 | self.assertEqual(A.data['status'], 'NEW') |
| 2662 | self.assertEqual(A.reported, 0) |
| 2663 | |
| 2664 | self.assertEqual(self.getJobFromHistory('project1-merge').result, |
| 2665 | 'SUCCESS') |
| 2666 | self.assertEqual(self.getJobFromHistory( |
| 2667 | 'project1-project2-integration').result, 'FAILURE') |
| 2668 | self.assertEqual(len(self.history), 2) |
| 2669 | |
| 2670 | # Remove the integration job. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2671 | self.updateConfigLayout( |
| 2672 | 'tests/fixtures/layout-live-reconfiguration-shared-queue.yaml') |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2673 | self.sched.reconfigure(self.config) |
| 2674 | self.waitUntilSettled() |
| 2675 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2676 | self.launch_server.hold_jobs_in_build = False |
| 2677 | self.launch_server.release() |
James E. Blair | fe707d1 | 2015-08-05 15:18:15 -0700 | [diff] [blame] | 2678 | self.waitUntilSettled() |
| 2679 | |
| 2680 | self.assertEqual(self.getJobFromHistory('project1-merge').result, |
| 2681 | 'SUCCESS') |
| 2682 | self.assertEqual(self.getJobFromHistory('project1-test1').result, |
| 2683 | 'SUCCESS') |
| 2684 | self.assertEqual(self.getJobFromHistory('project1-test2').result, |
| 2685 | 'SUCCESS') |
| 2686 | self.assertEqual(self.getJobFromHistory( |
| 2687 | 'project1-project2-integration').result, 'FAILURE') |
| 2688 | self.assertEqual(len(self.history), 4) |
| 2689 | |
| 2690 | self.assertEqual(A.data['status'], 'NEW') |
| 2691 | self.assertEqual(A.reported, 1) |
| 2692 | self.assertIn('Build succeeded', A.messages[0]) |
| 2693 | # Ensure the removed job was not included in the report. |
| 2694 | self.assertNotIn('project1-project2-integration', A.messages[0]) |
| 2695 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2696 | @skip("Disabled for early v3 development") |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2697 | def test_double_live_reconfiguration_shared_queue(self): |
| 2698 | # This was a real-world regression. A change is added to |
| 2699 | # gate; a reconfigure happens, a second change which depends |
| 2700 | # on the first is added, and a second reconfiguration happens. |
| 2701 | # Ensure that both changes merge. |
| 2702 | |
| 2703 | # A failure may indicate incorrect caching or cleaning up of |
| 2704 | # references during a reconfiguration. |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2705 | self.launch_server.hold_jobs_in_build = True |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2706 | |
| 2707 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2708 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 2709 | B.setDependsOn(A, 1) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2710 | A.addApproval('code-review', 2) |
| 2711 | B.addApproval('code-review', 2) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2712 | |
| 2713 | # Add the parent change. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2714 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2715 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2716 | self.launch_server.release('.*-merge') |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2717 | self.waitUntilSettled() |
| 2718 | |
| 2719 | # Reconfigure (with only one change in the pipeline). |
| 2720 | self.sched.reconfigure(self.config) |
| 2721 | self.waitUntilSettled() |
| 2722 | |
| 2723 | # Add the child change. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2724 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2725 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2726 | self.launch_server.release('.*-merge') |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2727 | self.waitUntilSettled() |
| 2728 | |
| 2729 | # Reconfigure (with both in the pipeline). |
| 2730 | self.sched.reconfigure(self.config) |
| 2731 | self.waitUntilSettled() |
| 2732 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2733 | self.launch_server.hold_jobs_in_build = False |
| 2734 | self.launch_server.release() |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 2735 | self.waitUntilSettled() |
| 2736 | |
| 2737 | self.assertEqual(len(self.history), 8) |
| 2738 | |
| 2739 | self.assertEqual(A.data['status'], 'MERGED') |
| 2740 | self.assertEqual(A.reported, 2) |
| 2741 | self.assertEqual(B.data['status'], 'MERGED') |
| 2742 | self.assertEqual(B.reported, 2) |
| 2743 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2744 | @skip("Disabled for early v3 development") |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2745 | def test_live_reconfiguration_del_project(self): |
| 2746 | # Test project deletion from layout |
| 2747 | # while changes are enqueued |
| 2748 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2749 | self.launch_server.hold_jobs_in_build = True |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2750 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2751 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 2752 | C = self.fake_gerrit.addFakeChange('org/project1', 'master', 'C') |
| 2753 | |
| 2754 | # A Depends-On: B |
| 2755 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 2756 | A.subject, B.data['id']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2757 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2758 | |
| 2759 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2760 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 2761 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2762 | self.launch_server.release('.*-merge') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2763 | self.waitUntilSettled() |
| 2764 | self.assertEqual(len(self.builds), 5) |
| 2765 | |
| 2766 | # This layout defines only org/project, not org/project1 |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2767 | self.updateConfigLayout( |
| 2768 | 'tests/fixtures/layout-live-reconfiguration-del-project.yaml') |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2769 | self.sched.reconfigure(self.config) |
| 2770 | self.waitUntilSettled() |
| 2771 | |
| 2772 | # Builds for C aborted, builds for A succeed, |
| 2773 | # and have change B applied ahead |
| 2774 | job_c = self.getJobFromHistory('project1-test1') |
| 2775 | self.assertEqual(job_c.changes, '3,1') |
| 2776 | self.assertEqual(job_c.result, 'ABORTED') |
| 2777 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2778 | self.launch_server.hold_jobs_in_build = False |
| 2779 | self.launch_server.release() |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 2780 | self.waitUntilSettled() |
| 2781 | |
| 2782 | self.assertEqual(self.getJobFromHistory('project-test1').changes, |
| 2783 | '2,1 1,1') |
| 2784 | |
| 2785 | self.assertEqual(A.data['status'], 'NEW') |
| 2786 | self.assertEqual(B.data['status'], 'NEW') |
| 2787 | self.assertEqual(C.data['status'], 'NEW') |
| 2788 | self.assertEqual(A.reported, 1) |
| 2789 | self.assertEqual(B.reported, 0) |
| 2790 | self.assertEqual(C.reported, 0) |
| 2791 | |
| 2792 | self.assertEqual(len(self.sched.layout.pipelines['check'].queues), 0) |
| 2793 | self.assertIn('Build succeeded', A.messages[0]) |
| 2794 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2795 | @skip("Disabled for early v3 development") |
James E. Blair | e712d9f | 2013-07-31 11:40:11 -0700 | [diff] [blame] | 2796 | def test_live_reconfiguration_functions(self): |
| 2797 | "Test live reconfiguration with a custom function" |
| 2798 | self.worker.registerFunction('build:node-project-test1:debian') |
| 2799 | self.worker.registerFunction('build:node-project-test1:wheezy') |
| 2800 | A = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2801 | A.addApproval('code-review', 2) |
| 2802 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | e712d9f | 2013-07-31 11:40:11 -0700 | [diff] [blame] | 2803 | self.waitUntilSettled() |
| 2804 | |
| 2805 | self.assertIsNone(self.getJobFromHistory('node-project-merge').node) |
| 2806 | self.assertEqual(self.getJobFromHistory('node-project-test1').node, |
| 2807 | 'debian') |
| 2808 | self.assertIsNone(self.getJobFromHistory('node-project-test2').node) |
| 2809 | |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2810 | self.updateConfigLayout( |
| 2811 | 'tests/fixtures/layout-live-reconfiguration-functions.yaml') |
James E. Blair | e712d9f | 2013-07-31 11:40:11 -0700 | [diff] [blame] | 2812 | self.sched.reconfigure(self.config) |
| 2813 | self.worker.build_history = [] |
| 2814 | |
| 2815 | B = self.fake_gerrit.addFakeChange('org/node-project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2816 | B.addApproval('code-review', 2) |
| 2817 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | e712d9f | 2013-07-31 11:40:11 -0700 | [diff] [blame] | 2818 | self.waitUntilSettled() |
| 2819 | |
| 2820 | self.assertIsNone(self.getJobFromHistory('node-project-merge').node) |
| 2821 | self.assertEqual(self.getJobFromHistory('node-project-test1').node, |
| 2822 | 'wheezy') |
| 2823 | self.assertIsNone(self.getJobFromHistory('node-project-test2').node) |
| 2824 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2825 | @skip("Disabled for early v3 development") |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2826 | def test_delayed_repo_init(self): |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2827 | self.updateConfigLayout( |
| 2828 | 'tests/fixtures/layout-delayed-repo-init.yaml') |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2829 | self.sched.reconfigure(self.config) |
| 2830 | |
| 2831 | self.init_repo("org/new-project") |
| 2832 | A = self.fake_gerrit.addFakeChange('org/new-project', 'master', 'A') |
| 2833 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2834 | A.addApproval('code-review', 2) |
| 2835 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 287c06d | 2013-07-24 10:39:30 -0700 | [diff] [blame] | 2836 | self.waitUntilSettled() |
| 2837 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2838 | 'SUCCESS') |
| 2839 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2840 | 'SUCCESS') |
| 2841 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2842 | 'SUCCESS') |
| 2843 | self.assertEqual(A.data['status'], 'MERGED') |
| 2844 | self.assertEqual(A.reported, 2) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2845 | |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2846 | def test_repo_deleted(self): |
Paul Belanger | 66e9596 | 2016-11-11 12:11:06 -0500 | [diff] [blame] | 2847 | self.updateConfigLayout('layout-repo-deleted') |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2848 | self.sched.reconfigure(self.config) |
| 2849 | |
| 2850 | self.init_repo("org/delete-project") |
| 2851 | A = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'A') |
| 2852 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2853 | A.addApproval('code-review', 2) |
| 2854 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2855 | self.waitUntilSettled() |
| 2856 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2857 | 'SUCCESS') |
| 2858 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2859 | 'SUCCESS') |
| 2860 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2861 | 'SUCCESS') |
| 2862 | self.assertEqual(A.data['status'], 'MERGED') |
| 2863 | self.assertEqual(A.reported, 2) |
| 2864 | |
| 2865 | # Delete org/new-project zuul repo. Should be recloned. |
| 2866 | shutil.rmtree(os.path.join(self.git_root, "org/delete-project")) |
| 2867 | |
| 2868 | B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B') |
| 2869 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 2870 | B.addApproval('code-review', 2) |
| 2871 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Clark Boylan | 6dbbc48 | 2013-10-18 10:57:31 -0700 | [diff] [blame] | 2872 | self.waitUntilSettled() |
| 2873 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 2874 | 'SUCCESS') |
| 2875 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 2876 | 'SUCCESS') |
| 2877 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 2878 | 'SUCCESS') |
| 2879 | self.assertEqual(B.data['status'], 'MERGED') |
| 2880 | self.assertEqual(B.reported, 2) |
| 2881 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2882 | @skip("Disabled for early v3 development") |
James E. Blair | 456f2fb | 2016-02-09 09:29:33 -0800 | [diff] [blame] | 2883 | def test_tags(self): |
| 2884 | "Test job tags" |
| 2885 | self.config.set('zuul', 'layout_config', |
| 2886 | 'tests/fixtures/layout-tags.yaml') |
| 2887 | self.sched.reconfigure(self.config) |
| 2888 | |
| 2889 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 2890 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 2891 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2892 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 2893 | self.waitUntilSettled() |
| 2894 | |
| 2895 | results = {'project1-merge': 'extratag merge project1', |
| 2896 | 'project2-merge': 'merge'} |
| 2897 | |
| 2898 | for build in self.history: |
| 2899 | self.assertEqual(results.get(build.name, ''), |
| 2900 | build.parameters.get('BUILD_TAGS')) |
| 2901 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2902 | @skip("Disabled for early v3 development") |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2903 | def test_timer(self): |
| 2904 | "Test that a periodic job is triggered" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2905 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2906 | self.updateConfigLayout( |
| 2907 | 'tests/fixtures/layout-timer.yaml') |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2908 | self.sched.reconfigure(self.config) |
| 2909 | self.registerJobs() |
| 2910 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2911 | # The pipeline triggers every second, so we should have seen |
| 2912 | # several by now. |
| 2913 | time.sleep(5) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2914 | self.waitUntilSettled() |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2915 | |
| 2916 | self.assertEqual(len(self.builds), 2) |
| 2917 | |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2918 | port = self.webapp.server.socket.getsockname()[1] |
| 2919 | |
Morgan Fainberg | 293f7f8 | 2016-05-30 14:01:22 -0700 | [diff] [blame] | 2920 | req = urllib.request.Request("http://localhost:%s/status.json" % port) |
| 2921 | f = urllib.request.urlopen(req) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2922 | data = f.read() |
| 2923 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2924 | self.launch_server.hold_jobs_in_build = False |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2925 | # Stop queuing timer triggered jobs so that the assertions |
| 2926 | # below don't race against more jobs being queued. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2927 | self.updateConfigLayout( |
| 2928 | 'tests/fixtures/layout-no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2929 | self.sched.reconfigure(self.config) |
| 2930 | self.registerJobs() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2931 | self.launch_server.release() |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2932 | self.waitUntilSettled() |
| 2933 | |
| 2934 | self.assertEqual(self.getJobFromHistory( |
| 2935 | 'project-bitrot-stable-old').result, 'SUCCESS') |
| 2936 | self.assertEqual(self.getJobFromHistory( |
| 2937 | 'project-bitrot-stable-older').result, 'SUCCESS') |
| 2938 | |
| 2939 | data = json.loads(data) |
| 2940 | status_jobs = set() |
| 2941 | for p in data['pipelines']: |
| 2942 | for q in p['change_queues']: |
| 2943 | for head in q['heads']: |
| 2944 | for change in head: |
Alex Gaynor | ddb9ef3 | 2013-09-16 21:04:58 -0700 | [diff] [blame] | 2945 | self.assertEqual(change['id'], None) |
James E. Blair | 63bb0ef | 2013-07-29 17:14:51 -0700 | [diff] [blame] | 2946 | for job in change['jobs']: |
| 2947 | status_jobs.add(job['name']) |
| 2948 | self.assertIn('project-bitrot-stable-old', status_jobs) |
| 2949 | self.assertIn('project-bitrot-stable-older', status_jobs) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2950 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 2951 | @skip("Disabled for early v3 development") |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2952 | def test_idle(self): |
| 2953 | "Test that frequent periodic jobs work" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2954 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2955 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2956 | for x in range(1, 3): |
| 2957 | # Test that timer triggers periodic jobs even across |
| 2958 | # layout config reloads. |
| 2959 | # Start timer trigger |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2960 | self.updateConfigLayout( |
| 2961 | 'tests/fixtures/layout-idle.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2962 | self.sched.reconfigure(self.config) |
| 2963 | self.registerJobs() |
James E. Blair | 995fc0f | 2016-02-04 16:48:31 -0800 | [diff] [blame] | 2964 | self.waitUntilSettled() |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2965 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2966 | # The pipeline triggers every second, so we should have seen |
| 2967 | # several by now. |
| 2968 | time.sleep(5) |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2969 | |
| 2970 | # Stop queuing timer triggered jobs so that the assertions |
| 2971 | # below don't race against more jobs being queued. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 2972 | self.updateConfigLayout( |
| 2973 | 'tests/fixtures/layout-no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2974 | self.sched.reconfigure(self.config) |
| 2975 | self.registerJobs() |
James E. Blair | 995fc0f | 2016-02-04 16:48:31 -0800 | [diff] [blame] | 2976 | self.waitUntilSettled() |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2977 | |
| 2978 | self.assertEqual(len(self.builds), 2) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 2979 | self.launch_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 2980 | self.waitUntilSettled() |
| 2981 | self.assertEqual(len(self.builds), 0) |
| 2982 | self.assertEqual(len(self.history), x * 2) |
James E. Blair | 4f6033c | 2014-03-27 15:49:09 -0700 | [diff] [blame] | 2983 | |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2984 | def test_check_smtp_pool(self): |
Paul Belanger | 01be8ca | 2016-11-11 12:21:06 -0500 | [diff] [blame] | 2985 | self.updateConfigLayout('layout-smtp') |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2986 | self.sched.reconfigure(self.config) |
| 2987 | |
| 2988 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 2989 | self.waitUntilSettled() |
| 2990 | |
| 2991 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 2992 | self.waitUntilSettled() |
| 2993 | |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 2994 | self.assertEqual(len(self.smtp_messages), 2) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 2995 | |
| 2996 | # A.messages only holds what FakeGerrit places in it. Thus we |
| 2997 | # work on the knowledge of what the first message should be as |
| 2998 | # it is only configured to go to SMTP. |
| 2999 | |
| 3000 | self.assertEqual('zuul@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3001 | self.smtp_messages[0]['from_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 3002 | self.assertEqual(['you@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3003 | self.smtp_messages[0]['to_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 3004 | self.assertEqual('Starting check jobs.', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3005 | self.smtp_messages[0]['body']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 3006 | |
| 3007 | self.assertEqual('zuul_from@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3008 | self.smtp_messages[1]['from_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 3009 | self.assertEqual(['alternative_me@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3010 | self.smtp_messages[1]['to_email']) |
Joshua Hesketh | 5fea867 | 2013-08-19 17:32:01 +1000 | [diff] [blame] | 3011 | self.assertEqual(A.messages[0], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3012 | self.smtp_messages[1]['body']) |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3013 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3014 | @skip("Disabled for early v3 development") |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3015 | def test_timer_smtp(self): |
| 3016 | "Test that a periodic job is triggered" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3017 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3018 | self.updateConfigLayout( |
| 3019 | 'tests/fixtures/layout-timer-smtp.yaml') |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3020 | self.sched.reconfigure(self.config) |
| 3021 | self.registerJobs() |
| 3022 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3023 | # The pipeline triggers every second, so we should have seen |
| 3024 | # several by now. |
| 3025 | time.sleep(5) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3026 | self.waitUntilSettled() |
| 3027 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3028 | self.assertEqual(len(self.builds), 2) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3029 | self.launch_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3030 | self.waitUntilSettled() |
| 3031 | self.assertEqual(len(self.history), 2) |
| 3032 | |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3033 | self.assertEqual(self.getJobFromHistory( |
| 3034 | 'project-bitrot-stable-old').result, 'SUCCESS') |
| 3035 | self.assertEqual(self.getJobFromHistory( |
| 3036 | 'project-bitrot-stable-older').result, 'SUCCESS') |
| 3037 | |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3038 | self.assertEqual(len(self.smtp_messages), 1) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3039 | |
| 3040 | # A.messages only holds what FakeGerrit places in it. Thus we |
| 3041 | # work on the knowledge of what the first message should be as |
| 3042 | # it is only configured to go to SMTP. |
| 3043 | |
| 3044 | self.assertEqual('zuul_from@example.com', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3045 | self.smtp_messages[0]['from_email']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3046 | self.assertEqual(['alternative_me@example.com'], |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3047 | self.smtp_messages[0]['to_email']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3048 | self.assertIn('Subject: Periodic check for org/project succeeded', |
James E. Blair | ff80a2f | 2013-12-27 13:24:06 -0800 | [diff] [blame] | 3049 | self.smtp_messages[0]['headers']) |
James E. Blair | e591020 | 2013-12-27 09:50:31 -0800 | [diff] [blame] | 3050 | |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3051 | # Stop queuing timer triggered jobs and let any that may have |
| 3052 | # queued through so that end of test assertions pass. |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3053 | self.updateConfigLayout( |
| 3054 | 'tests/fixtures/layout-no-timer.yaml') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3055 | self.sched.reconfigure(self.config) |
| 3056 | self.registerJobs() |
James E. Blair | f805897 | 2014-08-15 16:09:16 -0700 | [diff] [blame] | 3057 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3058 | self.launch_server.release('.*') |
Clark Boylan | 3ee090a | 2014-04-03 20:55:09 -0700 | [diff] [blame] | 3059 | self.waitUntilSettled() |
| 3060 | |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 3061 | def test_client_enqueue_change(self): |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3062 | "Test that the RPC client can enqueue a change" |
| 3063 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3064 | A.addApproval('code-review', 2) |
| 3065 | A.addApproval('approved', 1) |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3066 | |
| 3067 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3068 | self.gearman_server.port) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3069 | r = client.enqueue(tenant='tenant-one', |
| 3070 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3071 | project='org/project', |
| 3072 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3073 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3074 | self.waitUntilSettled() |
| 3075 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 3076 | 'SUCCESS') |
| 3077 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 3078 | 'SUCCESS') |
| 3079 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 3080 | 'SUCCESS') |
| 3081 | self.assertEqual(A.data['status'], 'MERGED') |
| 3082 | self.assertEqual(A.reported, 2) |
| 3083 | self.assertEqual(r, True) |
| 3084 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3085 | @skip("Disabled for early v3 development") |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 3086 | def test_client_enqueue_ref(self): |
| 3087 | "Test that the RPC client can enqueue a ref" |
| 3088 | |
| 3089 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3090 | self.gearman_server.port) |
| 3091 | r = client.enqueue_ref( |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3092 | tenant='tenant-one', |
James E. Blair | 91e3459 | 2015-07-31 16:45:59 -0700 | [diff] [blame] | 3093 | pipeline='post', |
| 3094 | project='org/project', |
| 3095 | trigger='gerrit', |
| 3096 | ref='master', |
| 3097 | oldrev='90f173846e3af9154517b88543ffbd1691f31366', |
| 3098 | newrev='d479a0bfcb34da57a31adb2a595c0cf687812543') |
| 3099 | self.waitUntilSettled() |
| 3100 | job_names = [x.name for x in self.history] |
| 3101 | self.assertEqual(len(self.history), 1) |
| 3102 | self.assertIn('project-post', job_names) |
| 3103 | self.assertEqual(r, True) |
| 3104 | |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3105 | def test_client_enqueue_negative(self): |
| 3106 | "Test that the RPC client returns errors" |
| 3107 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3108 | self.gearman_server.port) |
| 3109 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3110 | "Invalid tenant"): |
| 3111 | r = client.enqueue(tenant='tenant-foo', |
| 3112 | pipeline='gate', |
| 3113 | project='org/project', |
| 3114 | trigger='gerrit', |
| 3115 | change='1,1') |
| 3116 | client.shutdown() |
| 3117 | self.assertEqual(r, False) |
| 3118 | |
| 3119 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3120 | "Invalid project"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3121 | r = client.enqueue(tenant='tenant-one', |
| 3122 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3123 | project='project-does-not-exist', |
| 3124 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3125 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3126 | client.shutdown() |
| 3127 | self.assertEqual(r, False) |
| 3128 | |
| 3129 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3130 | "Invalid pipeline"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3131 | r = client.enqueue(tenant='tenant-one', |
| 3132 | pipeline='pipeline-does-not-exist', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3133 | project='org/project', |
| 3134 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3135 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3136 | client.shutdown() |
| 3137 | self.assertEqual(r, False) |
| 3138 | |
| 3139 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3140 | "Invalid trigger"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3141 | r = client.enqueue(tenant='tenant-one', |
| 3142 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3143 | project='org/project', |
| 3144 | trigger='trigger-does-not-exist', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3145 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3146 | client.shutdown() |
| 3147 | self.assertEqual(r, False) |
| 3148 | |
| 3149 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure, |
| 3150 | "Invalid change"): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3151 | r = client.enqueue(tenant='tenant-one', |
| 3152 | pipeline='gate', |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3153 | project='org/project', |
| 3154 | trigger='gerrit', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3155 | change='1,1') |
James E. Blair | ad28e91 | 2013-11-27 10:43:22 -0800 | [diff] [blame] | 3156 | client.shutdown() |
| 3157 | self.assertEqual(r, False) |
| 3158 | |
| 3159 | self.waitUntilSettled() |
| 3160 | self.assertEqual(len(self.history), 0) |
| 3161 | self.assertEqual(len(self.builds), 0) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3162 | |
| 3163 | def test_client_promote(self): |
| 3164 | "Test that the RPC client can promote a change" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3165 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3166 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3167 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3168 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3169 | A.addApproval('code-review', 2) |
| 3170 | B.addApproval('code-review', 2) |
| 3171 | C.addApproval('code-review', 2) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3172 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3173 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3174 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3175 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3176 | |
| 3177 | self.waitUntilSettled() |
| 3178 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3179 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 3180 | items = tenant.layout.pipelines['gate'].getAllItems() |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3181 | enqueue_times = {} |
| 3182 | for item in items: |
| 3183 | enqueue_times[str(item.change)] = item.enqueue_time |
| 3184 | |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3185 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3186 | self.gearman_server.port) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3187 | r = client.promote(tenant='tenant-one', |
| 3188 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3189 | change_ids=['2,1', '3,1']) |
| 3190 | |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3191 | # ensure that enqueue times are durable |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3192 | items = tenant.layout.pipelines['gate'].getAllItems() |
Sean Dague | f39b9ca | 2014-01-10 21:34:35 -0500 | [diff] [blame] | 3193 | for item in items: |
| 3194 | self.assertEqual( |
| 3195 | enqueue_times[str(item.change)], item.enqueue_time) |
| 3196 | |
James E. Blair | 78acec9 | 2014-02-06 07:11:32 -0800 | [diff] [blame] | 3197 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3198 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3199 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3200 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3201 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3202 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3203 | self.waitUntilSettled() |
| 3204 | |
| 3205 | self.assertEqual(len(self.builds), 6) |
| 3206 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3207 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3208 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3209 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3210 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 3211 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 3212 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3213 | self.assertTrue(self.builds[0].hasChanges(B)) |
| 3214 | self.assertFalse(self.builds[0].hasChanges(A)) |
| 3215 | self.assertFalse(self.builds[0].hasChanges(C)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3216 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3217 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 3218 | self.assertTrue(self.builds[2].hasChanges(C)) |
| 3219 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3220 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3221 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 3222 | self.assertTrue(self.builds[4].hasChanges(C)) |
| 3223 | self.assertTrue(self.builds[4].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3224 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3225 | self.launch_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3226 | self.waitUntilSettled() |
| 3227 | |
| 3228 | self.assertEqual(A.data['status'], 'MERGED') |
| 3229 | self.assertEqual(A.reported, 2) |
| 3230 | self.assertEqual(B.data['status'], 'MERGED') |
| 3231 | self.assertEqual(B.reported, 2) |
| 3232 | self.assertEqual(C.data['status'], 'MERGED') |
| 3233 | self.assertEqual(C.reported, 2) |
| 3234 | |
| 3235 | client.shutdown() |
| 3236 | self.assertEqual(r, True) |
| 3237 | |
| 3238 | def test_client_promote_dependent(self): |
| 3239 | "Test that the RPC client can promote a dependent change" |
| 3240 | # C (depends on B) -> B -> A ; then promote C to get: |
| 3241 | # A -> C (depends on B) -> B |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3242 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3243 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3244 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3245 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3246 | |
| 3247 | C.setDependsOn(B, 1) |
| 3248 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3249 | A.addApproval('code-review', 2) |
| 3250 | B.addApproval('code-review', 2) |
| 3251 | C.addApproval('code-review', 2) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3252 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3253 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3254 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3255 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3256 | |
| 3257 | self.waitUntilSettled() |
| 3258 | |
| 3259 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3260 | self.gearman_server.port) |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3261 | r = client.promote(tenant='tenant-one', |
| 3262 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3263 | change_ids=['3,1']) |
| 3264 | |
James E. Blair | 78acec9 | 2014-02-06 07:11:32 -0800 | [diff] [blame] | 3265 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3266 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3267 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3268 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3269 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3270 | self.launch_server.release('.*-merge') |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3271 | self.waitUntilSettled() |
| 3272 | |
| 3273 | self.assertEqual(len(self.builds), 6) |
| 3274 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3275 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3276 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3277 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3278 | self.assertEqual(self.builds[4].name, 'project-test1') |
| 3279 | self.assertEqual(self.builds[5].name, 'project-test2') |
| 3280 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3281 | self.assertTrue(self.builds[0].hasChanges(B)) |
| 3282 | self.assertFalse(self.builds[0].hasChanges(A)) |
| 3283 | self.assertFalse(self.builds[0].hasChanges(C)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3284 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3285 | self.assertTrue(self.builds[2].hasChanges(B)) |
| 3286 | self.assertTrue(self.builds[2].hasChanges(C)) |
| 3287 | self.assertFalse(self.builds[2].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3288 | |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3289 | self.assertTrue(self.builds[4].hasChanges(B)) |
| 3290 | self.assertTrue(self.builds[4].hasChanges(C)) |
| 3291 | self.assertTrue(self.builds[4].hasChanges(A)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3292 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3293 | self.launch_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3294 | self.waitUntilSettled() |
| 3295 | |
| 3296 | self.assertEqual(A.data['status'], 'MERGED') |
| 3297 | self.assertEqual(A.reported, 2) |
| 3298 | self.assertEqual(B.data['status'], 'MERGED') |
| 3299 | self.assertEqual(B.reported, 2) |
| 3300 | self.assertEqual(C.data['status'], 'MERGED') |
| 3301 | self.assertEqual(C.reported, 2) |
| 3302 | |
| 3303 | client.shutdown() |
| 3304 | self.assertEqual(r, True) |
| 3305 | |
| 3306 | def test_client_promote_negative(self): |
| 3307 | "Test that the RPC client returns errors for promotion" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3308 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3309 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3310 | A.addApproval('code-review', 2) |
| 3311 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3312 | self.waitUntilSettled() |
| 3313 | |
| 3314 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3315 | self.gearman_server.port) |
| 3316 | |
| 3317 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3318 | r = client.promote(tenant='tenant-one', |
| 3319 | pipeline='nonexistent', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3320 | change_ids=['2,1', '3,1']) |
| 3321 | client.shutdown() |
| 3322 | self.assertEqual(r, False) |
| 3323 | |
| 3324 | with testtools.ExpectedException(zuul.rpcclient.RPCFailure): |
Paul Belanger | baca313 | 2016-11-04 12:49:54 -0400 | [diff] [blame] | 3325 | r = client.promote(tenant='tenant-one', |
| 3326 | pipeline='gate', |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3327 | change_ids=['4,1']) |
| 3328 | client.shutdown() |
| 3329 | self.assertEqual(r, False) |
| 3330 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3331 | self.launch_server.hold_jobs_in_build = False |
| 3332 | self.launch_server.release() |
James E. Blair | 36658cf | 2013-12-06 17:53:48 -0800 | [diff] [blame] | 3333 | self.waitUntilSettled() |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3334 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3335 | @skip("Disabled for early v3 development") |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3336 | def test_queue_rate_limiting(self): |
| 3337 | "Test that DependentPipelines are rate limited with dep across window" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3338 | self.updateConfigLayout( |
| 3339 | 'tests/fixtures/layout-rate-limit.yaml') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3340 | self.sched.reconfigure(self.config) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3341 | self.launch_server.hold_jobs_in_build = True |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3342 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3343 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3344 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3345 | |
| 3346 | C.setDependsOn(B, 1) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3347 | self.launch_server.failJob('project-test1', A) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3348 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3349 | A.addApproval('code-review', 2) |
| 3350 | B.addApproval('code-review', 2) |
| 3351 | C.addApproval('code-review', 2) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3352 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3353 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3354 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3355 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3356 | self.waitUntilSettled() |
| 3357 | |
| 3358 | # Only A and B will have their merge jobs queued because |
| 3359 | # window is 2. |
| 3360 | self.assertEqual(len(self.builds), 2) |
| 3361 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3362 | self.assertEqual(self.builds[1].name, 'project-merge') |
| 3363 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3364 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3365 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3366 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3367 | self.waitUntilSettled() |
| 3368 | |
| 3369 | # Only A and B will have their test jobs queued because |
| 3370 | # window is 2. |
| 3371 | self.assertEqual(len(self.builds), 4) |
| 3372 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3373 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3374 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3375 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3376 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3377 | self.launch_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3378 | self.waitUntilSettled() |
| 3379 | |
| 3380 | queue = self.sched.layout.pipelines['gate'].queues[0] |
| 3381 | # A failed so window is reduced by 1 to 1. |
| 3382 | self.assertEqual(queue.window, 1) |
| 3383 | self.assertEqual(queue.window_floor, 1) |
| 3384 | self.assertEqual(A.data['status'], 'NEW') |
| 3385 | |
| 3386 | # Gate is reset and only B's merge job is queued because |
| 3387 | # window shrunk to 1. |
| 3388 | self.assertEqual(len(self.builds), 1) |
| 3389 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3390 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3391 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3392 | self.waitUntilSettled() |
| 3393 | |
| 3394 | # Only B's test jobs are queued because window is still 1. |
| 3395 | self.assertEqual(len(self.builds), 2) |
| 3396 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3397 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3398 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3399 | self.launch_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3400 | self.waitUntilSettled() |
| 3401 | |
| 3402 | # B was successfully merged so window is increased to 2. |
| 3403 | self.assertEqual(queue.window, 2) |
| 3404 | self.assertEqual(queue.window_floor, 1) |
| 3405 | self.assertEqual(B.data['status'], 'MERGED') |
| 3406 | |
| 3407 | # Only C is left and its merge job is queued. |
| 3408 | self.assertEqual(len(self.builds), 1) |
| 3409 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3410 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3411 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3412 | self.waitUntilSettled() |
| 3413 | |
| 3414 | # After successful merge job the test jobs for C are queued. |
| 3415 | self.assertEqual(len(self.builds), 2) |
| 3416 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3417 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3418 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3419 | self.launch_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3420 | self.waitUntilSettled() |
| 3421 | |
| 3422 | # C successfully merged so window is bumped to 3. |
| 3423 | self.assertEqual(queue.window, 3) |
| 3424 | self.assertEqual(queue.window_floor, 1) |
| 3425 | self.assertEqual(C.data['status'], 'MERGED') |
| 3426 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3427 | @skip("Disabled for early v3 development") |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3428 | def test_queue_rate_limiting_dependent(self): |
| 3429 | "Test that DependentPipelines are rate limited with dep in window" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3430 | self.updateConfigLayout( |
| 3431 | 'tests/fixtures/layout-rate-limit.yaml') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3432 | self.sched.reconfigure(self.config) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3433 | self.launch_server.hold_jobs_in_build = True |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3434 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3435 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3436 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3437 | |
| 3438 | B.setDependsOn(A, 1) |
| 3439 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3440 | self.launch_server.failJob('project-test1', A) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3441 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3442 | A.addApproval('code-review', 2) |
| 3443 | B.addApproval('code-review', 2) |
| 3444 | C.addApproval('code-review', 2) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3445 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3446 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3447 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3448 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3449 | self.waitUntilSettled() |
| 3450 | |
| 3451 | # Only A and B will have their merge jobs queued because |
| 3452 | # window is 2. |
| 3453 | self.assertEqual(len(self.builds), 2) |
| 3454 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3455 | self.assertEqual(self.builds[1].name, 'project-merge') |
| 3456 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3457 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3458 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3459 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3460 | self.waitUntilSettled() |
| 3461 | |
| 3462 | # Only A and B will have their test jobs queued because |
| 3463 | # window is 2. |
| 3464 | self.assertEqual(len(self.builds), 4) |
| 3465 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3466 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3467 | self.assertEqual(self.builds[2].name, 'project-test1') |
| 3468 | self.assertEqual(self.builds[3].name, 'project-test2') |
| 3469 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3470 | self.launch_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3471 | self.waitUntilSettled() |
| 3472 | |
| 3473 | queue = self.sched.layout.pipelines['gate'].queues[0] |
| 3474 | # A failed so window is reduced by 1 to 1. |
| 3475 | self.assertEqual(queue.window, 1) |
| 3476 | self.assertEqual(queue.window_floor, 1) |
| 3477 | self.assertEqual(A.data['status'], 'NEW') |
| 3478 | self.assertEqual(B.data['status'], 'NEW') |
| 3479 | |
| 3480 | # Gate is reset and only C's merge job is queued because |
| 3481 | # window shrunk to 1 and A and B were dequeued. |
| 3482 | self.assertEqual(len(self.builds), 1) |
| 3483 | self.assertEqual(self.builds[0].name, 'project-merge') |
| 3484 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3485 | self.launch_server.release('.*-merge') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3486 | self.waitUntilSettled() |
| 3487 | |
| 3488 | # Only C's test jobs are queued because window is still 1. |
| 3489 | self.assertEqual(len(self.builds), 2) |
| 3490 | self.assertEqual(self.builds[0].name, 'project-test1') |
| 3491 | self.assertEqual(self.builds[1].name, 'project-test2') |
| 3492 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3493 | self.launch_server.release('project-.*') |
Clark Boylan | 7603a37 | 2014-01-21 11:43:20 -0800 | [diff] [blame] | 3494 | self.waitUntilSettled() |
| 3495 | |
| 3496 | # C was successfully merged so window is increased to 2. |
| 3497 | self.assertEqual(queue.window, 2) |
| 3498 | self.assertEqual(queue.window_floor, 1) |
| 3499 | self.assertEqual(C.data['status'], 'MERGED') |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3500 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3501 | @skip("Disabled for early v3 development") |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3502 | def test_worker_update_metadata(self): |
| 3503 | "Test if a worker can send back metadata about itself" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3504 | self.launch_server.hold_jobs_in_build = True |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3505 | |
| 3506 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3507 | A.addApproval('code-review', 2) |
| 3508 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3509 | self.waitUntilSettled() |
| 3510 | |
| 3511 | self.assertEqual(len(self.launcher.builds), 1) |
| 3512 | |
| 3513 | self.log.debug('Current builds:') |
| 3514 | self.log.debug(self.launcher.builds) |
| 3515 | |
| 3516 | start = time.time() |
| 3517 | while True: |
| 3518 | if time.time() - start > 10: |
| 3519 | raise Exception("Timeout waiting for gearman server to report " |
| 3520 | + "back to the client") |
| 3521 | build = self.launcher.builds.values()[0] |
| 3522 | if build.worker.name == "My Worker": |
| 3523 | break |
| 3524 | else: |
| 3525 | time.sleep(0) |
| 3526 | |
| 3527 | self.log.debug(build) |
| 3528 | self.assertEqual("My Worker", build.worker.name) |
| 3529 | self.assertEqual("localhost", build.worker.hostname) |
| 3530 | self.assertEqual(['127.0.0.1', '192.168.1.1'], build.worker.ips) |
| 3531 | self.assertEqual("zuul.example.org", build.worker.fqdn) |
| 3532 | self.assertEqual("FakeBuilder", build.worker.program) |
| 3533 | self.assertEqual("v1.1", build.worker.version) |
| 3534 | self.assertEqual({'something': 'else'}, build.worker.extra) |
| 3535 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3536 | self.launch_server.hold_jobs_in_build = False |
| 3537 | self.launch_server.release() |
Joshua Hesketh | ba8776a | 2014-01-12 14:35:40 +0800 | [diff] [blame] | 3538 | self.waitUntilSettled() |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3539 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3540 | @skip("Disabled for early v3 development") |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3541 | def test_footer_message(self): |
| 3542 | "Test a pipeline's footer message is correctly added to the report." |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3543 | self.updateConfigLayout( |
| 3544 | 'tests/fixtures/layout-footer-message.yaml') |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3545 | self.sched.reconfigure(self.config) |
| 3546 | self.registerJobs() |
| 3547 | |
| 3548 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3549 | A.addApproval('code-review', 2) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3550 | self.launch_server.failJob('test1', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3551 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3552 | self.waitUntilSettled() |
| 3553 | |
| 3554 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3555 | B.addApproval('code-review', 2) |
| 3556 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Joshua Hesketh | 3979e3e | 2014-03-04 11:21:10 +1100 | [diff] [blame] | 3557 | self.waitUntilSettled() |
| 3558 | |
| 3559 | self.assertEqual(2, len(self.smtp_messages)) |
| 3560 | |
| 3561 | failure_body = """\ |
| 3562 | Build failed. For information on how to proceed, see \ |
| 3563 | http://wiki.example.org/Test_Failures |
| 3564 | |
| 3565 | - test1 http://logs.example.com/1/1/gate/test1/0 : FAILURE in 0s |
| 3566 | - test2 http://logs.example.com/1/1/gate/test2/1 : SUCCESS in 0s |
| 3567 | |
| 3568 | For CI problems and help debugging, contact ci@example.org""" |
| 3569 | |
| 3570 | success_body = """\ |
| 3571 | Build succeeded. |
| 3572 | |
| 3573 | - test1 http://logs.example.com/2/1/gate/test1/2 : SUCCESS in 0s |
| 3574 | - test2 http://logs.example.com/2/1/gate/test2/3 : SUCCESS in 0s |
| 3575 | |
| 3576 | For CI problems and help debugging, contact ci@example.org""" |
| 3577 | |
| 3578 | self.assertEqual(failure_body, self.smtp_messages[0]['body']) |
| 3579 | self.assertEqual(success_body, self.smtp_messages[1]['body']) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3580 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3581 | @skip("Disabled for early v3 development") |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3582 | def test_merge_failure_reporters(self): |
| 3583 | """Check that the config is set up correctly""" |
| 3584 | |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3585 | self.updateConfigLayout( |
| 3586 | 'tests/fixtures/layout-merge-failure.yaml') |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3587 | self.sched.reconfigure(self.config) |
| 3588 | self.registerJobs() |
| 3589 | |
| 3590 | self.assertEqual( |
Jeremy Stanley | 1c2c3c2 | 2015-06-15 21:23:19 +0000 | [diff] [blame] | 3591 | "Merge Failed.\n\nThis change or one of its cross-repo " |
| 3592 | "dependencies was unable to be automatically merged with the " |
| 3593 | "current state of its repository. Please rebase the change and " |
| 3594 | "upload a new patchset.", |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3595 | self.sched.layout.pipelines['check'].merge_failure_message) |
| 3596 | self.assertEqual( |
| 3597 | "The merge failed! For more information...", |
| 3598 | self.sched.layout.pipelines['gate'].merge_failure_message) |
| 3599 | |
| 3600 | self.assertEqual( |
| 3601 | len(self.sched.layout.pipelines['check'].merge_failure_actions), 1) |
| 3602 | self.assertEqual( |
| 3603 | len(self.sched.layout.pipelines['gate'].merge_failure_actions), 2) |
| 3604 | |
| 3605 | self.assertTrue(isinstance( |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3606 | self.sched.layout.pipelines['check'].merge_failure_actions[0], |
| 3607 | zuul.reporter.gerrit.GerritReporter)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3608 | |
| 3609 | self.assertTrue( |
| 3610 | ( |
| 3611 | isinstance(self.sched.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3612 | merge_failure_actions[0], |
Joshua Hesketh | ffe4206 | 2014-09-05 21:43:52 +1000 | [diff] [blame] | 3613 | zuul.reporter.smtp.SMTPReporter) and |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3614 | isinstance(self.sched.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3615 | merge_failure_actions[1], |
Joshua Hesketh | ffe4206 | 2014-09-05 21:43:52 +1000 | [diff] [blame] | 3616 | zuul.reporter.gerrit.GerritReporter) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3617 | ) or ( |
| 3618 | isinstance(self.sched.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3619 | merge_failure_actions[0], |
Joshua Hesketh | ffe4206 | 2014-09-05 21:43:52 +1000 | [diff] [blame] | 3620 | zuul.reporter.gerrit.GerritReporter) and |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3621 | isinstance(self.sched.layout.pipelines['gate']. |
Joshua Hesketh | de95865 | 2015-11-10 19:19:50 +1100 | [diff] [blame] | 3622 | merge_failure_actions[1], |
Joshua Hesketh | ffe4206 | 2014-09-05 21:43:52 +1000 | [diff] [blame] | 3623 | zuul.reporter.smtp.SMTPReporter) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3624 | ) |
| 3625 | ) |
| 3626 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3627 | @skip("Disabled for early v3 development") |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3628 | def test_merge_failure_reports(self): |
| 3629 | """Check that when a change fails to merge the correct message is sent |
| 3630 | to the correct reporter""" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3631 | self.updateConfigLayout( |
| 3632 | 'tests/fixtures/layout-merge-failure.yaml') |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3633 | self.sched.reconfigure(self.config) |
| 3634 | self.registerJobs() |
| 3635 | |
| 3636 | # Check a test failure isn't reported to SMTP |
| 3637 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3638 | A.addApproval('code-review', 2) |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3639 | self.launch_server.failJob('project-test1', A) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3640 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3641 | self.waitUntilSettled() |
| 3642 | |
| 3643 | self.assertEqual(3, len(self.history)) # 3 jobs |
| 3644 | self.assertEqual(0, len(self.smtp_messages)) |
| 3645 | |
| 3646 | # Check a merge failure is reported to SMTP |
| 3647 | # B should be merged, but C will conflict with B |
| 3648 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3649 | B.addPatchset(['conflict']) |
| 3650 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 3651 | C.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3652 | B.addApproval('code-review', 2) |
| 3653 | C.addApproval('code-review', 2) |
| 3654 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 3655 | self.fake_gerrit.addEvent(C.addApproval('approved', 1)) |
Joshua Hesketh | b717977 | 2014-01-30 23:30:46 +1100 | [diff] [blame] | 3656 | self.waitUntilSettled() |
| 3657 | |
| 3658 | self.assertEqual(6, len(self.history)) # A and B jobs |
| 3659 | self.assertEqual(1, len(self.smtp_messages)) |
| 3660 | self.assertEqual('The merge failed! For more information...', |
| 3661 | self.smtp_messages[0]['body']) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3662 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3663 | @skip("Disabled for early v3 development") |
James E. Blair | f760f0e | 2016-02-09 08:44:52 -0800 | [diff] [blame] | 3664 | def test_default_merge_failure_reports(self): |
| 3665 | """Check that the default merge failure reports are correct.""" |
| 3666 | |
| 3667 | # A should report success, B should report merge failure. |
| 3668 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3669 | A.addPatchset(['conflict']) |
| 3670 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 3671 | B.addPatchset(['conflict']) |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3672 | A.addApproval('code-review', 2) |
| 3673 | B.addApproval('code-review', 2) |
| 3674 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 3675 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | f760f0e | 2016-02-09 08:44:52 -0800 | [diff] [blame] | 3676 | self.waitUntilSettled() |
| 3677 | |
| 3678 | self.assertEqual(3, len(self.history)) # A jobs |
| 3679 | self.assertEqual(A.reported, 2) |
| 3680 | self.assertEqual(B.reported, 2) |
| 3681 | self.assertEqual(A.data['status'], 'MERGED') |
| 3682 | self.assertEqual(B.data['status'], 'NEW') |
| 3683 | self.assertIn('Build succeeded', A.messages[1]) |
| 3684 | self.assertIn('Merge Failed', B.messages[1]) |
| 3685 | self.assertIn('automatically merged', B.messages[1]) |
| 3686 | self.assertNotIn('logs.example.com', B.messages[1]) |
| 3687 | self.assertNotIn('SKIPPED', B.messages[1]) |
| 3688 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3689 | @skip("Disabled for early v3 development") |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3690 | def test_swift_instructions(self): |
| 3691 | "Test that the correct swift instructions are sent to the workers" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 3692 | self.updateConfigLayout( |
| 3693 | 'tests/fixtures/layout-swift.yaml') |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3694 | self.sched.reconfigure(self.config) |
| 3695 | self.registerJobs() |
| 3696 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3697 | self.launch_server.hold_jobs_in_build = True |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3698 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 3699 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3700 | A.addApproval('code-review', 2) |
| 3701 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3702 | self.waitUntilSettled() |
| 3703 | |
| 3704 | self.assertEqual( |
| 3705 | "https://storage.example.org/V1/AUTH_account/merge_logs/1/1/1/" |
| 3706 | "gate/test-merge/", |
Joshua Hesketh | 76dee53 | 2014-07-03 15:39:13 +1000 | [diff] [blame] | 3707 | self.builds[0].parameters['SWIFT_logs_URL'][:-7]) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3708 | self.assertEqual(5, |
| 3709 | len(self.builds[0].parameters['SWIFT_logs_HMAC_BODY']. |
| 3710 | split('\n'))) |
| 3711 | self.assertIn('SWIFT_logs_SIGNATURE', self.builds[0].parameters) |
| 3712 | |
| 3713 | self.assertEqual( |
| 3714 | "https://storage.example.org/V1/AUTH_account/logs/1/1/1/" |
| 3715 | "gate/test-test/", |
Joshua Hesketh | 76dee53 | 2014-07-03 15:39:13 +1000 | [diff] [blame] | 3716 | self.builds[1].parameters['SWIFT_logs_URL'][:-7]) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3717 | self.assertEqual(5, |
| 3718 | len(self.builds[1].parameters['SWIFT_logs_HMAC_BODY']. |
| 3719 | split('\n'))) |
| 3720 | self.assertIn('SWIFT_logs_SIGNATURE', self.builds[1].parameters) |
| 3721 | |
| 3722 | self.assertEqual( |
| 3723 | "https://storage.example.org/V1/AUTH_account/stash/1/1/1/" |
| 3724 | "gate/test-test/", |
Joshua Hesketh | 76dee53 | 2014-07-03 15:39:13 +1000 | [diff] [blame] | 3725 | self.builds[1].parameters['SWIFT_MOSTLY_URL'][:-7]) |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3726 | self.assertEqual(5, |
| 3727 | len(self.builds[1]. |
| 3728 | parameters['SWIFT_MOSTLY_HMAC_BODY'].split('\n'))) |
| 3729 | self.assertIn('SWIFT_MOSTLY_SIGNATURE', self.builds[1].parameters) |
| 3730 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3731 | self.launch_server.hold_jobs_in_build = False |
| 3732 | self.launch_server.release() |
Joshua Hesketh | 36c3fa5 | 2014-01-22 11:40:52 +1100 | [diff] [blame] | 3733 | self.waitUntilSettled() |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3734 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 3735 | @skip("Disabled for early v3 development") |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3736 | def test_client_get_running_jobs(self): |
| 3737 | "Test that the RPC client can get a list of running jobs" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3738 | self.launch_server.hold_jobs_in_build = True |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3739 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3740 | A.addApproval('code-review', 2) |
| 3741 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3742 | self.waitUntilSettled() |
| 3743 | |
| 3744 | client = zuul.rpcclient.RPCClient('127.0.0.1', |
| 3745 | self.gearman_server.port) |
| 3746 | |
| 3747 | # Wait for gearman server to send the initial workData back to zuul |
| 3748 | start = time.time() |
| 3749 | while True: |
| 3750 | if time.time() - start > 10: |
| 3751 | raise Exception("Timeout waiting for gearman server to report " |
| 3752 | + "back to the client") |
| 3753 | build = self.launcher.builds.values()[0] |
| 3754 | if build.worker.name == "My Worker": |
| 3755 | break |
| 3756 | else: |
| 3757 | time.sleep(0) |
| 3758 | |
| 3759 | running_items = client.get_running_jobs() |
| 3760 | |
| 3761 | self.assertEqual(1, len(running_items)) |
| 3762 | running_item = running_items[0] |
| 3763 | self.assertEqual([], running_item['failing_reasons']) |
| 3764 | self.assertEqual([], running_item['items_behind']) |
| 3765 | self.assertEqual('https://hostname/1', running_item['url']) |
| 3766 | self.assertEqual(None, running_item['item_ahead']) |
| 3767 | self.assertEqual('org/project', running_item['project']) |
| 3768 | self.assertEqual(None, running_item['remaining_time']) |
| 3769 | self.assertEqual(True, running_item['active']) |
| 3770 | self.assertEqual('1,1', running_item['id']) |
| 3771 | |
| 3772 | self.assertEqual(3, len(running_item['jobs'])) |
| 3773 | for job in running_item['jobs']: |
| 3774 | if job['name'] == 'project-merge': |
| 3775 | self.assertEqual('project-merge', job['name']) |
| 3776 | self.assertEqual('gate', job['pipeline']) |
| 3777 | self.assertEqual(False, job['retry']) |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3778 | self.assertEqual('https://server/job/project-merge/0/', |
| 3779 | job['url']) |
| 3780 | self.assertEqual(7, len(job['worker'])) |
| 3781 | self.assertEqual(False, job['canceled']) |
| 3782 | self.assertEqual(True, job['voting']) |
| 3783 | self.assertEqual(None, job['result']) |
| 3784 | self.assertEqual('gate', job['pipeline']) |
| 3785 | break |
| 3786 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3787 | self.launch_server.hold_jobs_in_build = False |
| 3788 | self.launch_server.release() |
Joshua Hesketh | 85af4e9 | 2014-02-21 08:28:58 -0800 | [diff] [blame] | 3789 | self.waitUntilSettled() |
| 3790 | |
| 3791 | running_items = client.get_running_jobs() |
| 3792 | self.assertEqual(0, len(running_items)) |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3793 | |
| 3794 | def test_nonvoting_pipeline(self): |
| 3795 | "Test that a nonvoting pipeline (experimental) can still report" |
| 3796 | |
Joshua Hesketh | cc017ea | 2014-04-30 19:55:25 +1000 | [diff] [blame] | 3797 | A = self.fake_gerrit.addFakeChange('org/experimental-project', |
| 3798 | 'master', 'A') |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3799 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 3800 | self.waitUntilSettled() |
Paul Belanger | 15e3e20 | 2016-10-14 16:27:34 -0400 | [diff] [blame] | 3801 | |
| 3802 | self.assertEqual(self.getJobFromHistory('project-merge').result, |
| 3803 | 'SUCCESS') |
Joshua Hesketh | cc017ea | 2014-04-30 19:55:25 +1000 | [diff] [blame] | 3804 | self.assertEqual( |
| 3805 | self.getJobFromHistory('experimental-project-test').result, |
| 3806 | 'SUCCESS') |
James E. Blair | badc1ad | 2014-04-28 13:55:14 -0700 | [diff] [blame] | 3807 | self.assertEqual(A.reported, 1) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3808 | |
| 3809 | def test_crd_gate(self): |
| 3810 | "Test cross-repo dependencies" |
| 3811 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3812 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3813 | A.addApproval('code-review', 2) |
| 3814 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3815 | |
| 3816 | AM2 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM2') |
| 3817 | AM1 = self.fake_gerrit.addFakeChange('org/project1', 'master', 'AM1') |
| 3818 | AM2.setMerged() |
| 3819 | AM1.setMerged() |
| 3820 | |
| 3821 | BM2 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM2') |
| 3822 | BM1 = self.fake_gerrit.addFakeChange('org/project2', 'master', 'BM1') |
| 3823 | BM2.setMerged() |
| 3824 | BM1.setMerged() |
| 3825 | |
| 3826 | # A -> AM1 -> AM2 |
| 3827 | # B -> BM1 -> BM2 |
| 3828 | # A Depends-On: B |
| 3829 | # M2 is here to make sure it is never queried. If it is, it |
| 3830 | # means zuul is walking down the entire history of merged |
| 3831 | # changes. |
| 3832 | |
| 3833 | B.setDependsOn(BM1, 1) |
| 3834 | BM1.setDependsOn(BM2, 1) |
| 3835 | |
| 3836 | A.setDependsOn(AM1, 1) |
| 3837 | AM1.setDependsOn(AM2, 1) |
| 3838 | |
| 3839 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3840 | A.subject, B.data['id']) |
| 3841 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3842 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3843 | self.waitUntilSettled() |
| 3844 | |
| 3845 | self.assertEqual(A.data['status'], 'NEW') |
| 3846 | self.assertEqual(B.data['status'], 'NEW') |
| 3847 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3848 | for connection in self.connections.connections.values(): |
Joshua Hesketh | 4bd7da3 | 2016-02-17 20:58:47 +1100 | [diff] [blame] | 3849 | connection.maintainCache([]) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3850 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3851 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3852 | B.addApproval('approved', 1) |
| 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 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3856 | self.launch_server.release('.*-merge') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3857 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3858 | self.launch_server.release('.*-merge') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3859 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3860 | self.launch_server.hold_jobs_in_build = False |
| 3861 | self.launch_server.release() |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3862 | self.waitUntilSettled() |
| 3863 | |
| 3864 | self.assertEqual(AM2.queried, 0) |
| 3865 | self.assertEqual(BM2.queried, 0) |
| 3866 | self.assertEqual(A.data['status'], 'MERGED') |
| 3867 | self.assertEqual(B.data['status'], 'MERGED') |
| 3868 | self.assertEqual(A.reported, 2) |
| 3869 | self.assertEqual(B.reported, 2) |
| 3870 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3871 | changes = self.getJobFromHistory( |
| 3872 | 'project-merge', 'org/project1').changes |
| 3873 | self.assertEqual(changes, '2,1 1,1') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3874 | |
| 3875 | def test_crd_branch(self): |
| 3876 | "Test cross-repo dependencies in multiple branches" |
Paul Belanger | 6379db1 | 2016-11-14 13:57:54 -0500 | [diff] [blame] | 3877 | |
| 3878 | self.create_branch('org/project2', 'mp') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3879 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3880 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 3881 | C = self.fake_gerrit.addFakeChange('org/project2', 'mp', 'C') |
| 3882 | C.data['id'] = B.data['id'] |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3883 | A.addApproval('code-review', 2) |
| 3884 | B.addApproval('code-review', 2) |
| 3885 | C.addApproval('code-review', 2) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3886 | |
| 3887 | # A Depends-On: B+C |
| 3888 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3889 | A.subject, B.data['id']) |
| 3890 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3891 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3892 | B.addApproval('approved', 1) |
| 3893 | C.addApproval('approved', 1) |
| 3894 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3895 | self.waitUntilSettled() |
| 3896 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3897 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3898 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3899 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3900 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3901 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3902 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3903 | self.launch_server.hold_jobs_in_build = False |
| 3904 | self.launch_server.release() |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3905 | self.waitUntilSettled() |
| 3906 | |
| 3907 | self.assertEqual(A.data['status'], 'MERGED') |
| 3908 | self.assertEqual(B.data['status'], 'MERGED') |
| 3909 | self.assertEqual(C.data['status'], 'MERGED') |
| 3910 | self.assertEqual(A.reported, 2) |
| 3911 | self.assertEqual(B.reported, 2) |
| 3912 | self.assertEqual(C.reported, 2) |
| 3913 | |
Paul Belanger | 6379db1 | 2016-11-14 13:57:54 -0500 | [diff] [blame] | 3914 | changes = self.getJobFromHistory( |
| 3915 | 'project-merge', 'org/project1').changes |
| 3916 | self.assertEqual(changes, '2,1 3,1 1,1') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3917 | |
| 3918 | def test_crd_multiline(self): |
| 3919 | "Test multiple depends-on lines in commit" |
| 3920 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3921 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 3922 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3923 | A.addApproval('code-review', 2) |
| 3924 | B.addApproval('code-review', 2) |
| 3925 | C.addApproval('code-review', 2) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3926 | |
| 3927 | # A Depends-On: B+C |
| 3928 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\nDepends-On: %s\n' % ( |
| 3929 | A.subject, B.data['id'], C.data['id']) |
| 3930 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3931 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3932 | B.addApproval('approved', 1) |
| 3933 | C.addApproval('approved', 1) |
| 3934 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3935 | self.waitUntilSettled() |
| 3936 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3937 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3938 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3939 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3940 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3941 | self.launch_server.release('.*-merge') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3942 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 3943 | self.launch_server.hold_jobs_in_build = False |
| 3944 | self.launch_server.release() |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 3945 | self.waitUntilSettled() |
| 3946 | |
| 3947 | self.assertEqual(A.data['status'], 'MERGED') |
| 3948 | self.assertEqual(B.data['status'], 'MERGED') |
| 3949 | self.assertEqual(C.data['status'], 'MERGED') |
| 3950 | self.assertEqual(A.reported, 2) |
| 3951 | self.assertEqual(B.reported, 2) |
| 3952 | self.assertEqual(C.reported, 2) |
| 3953 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 3954 | changes = self.getJobFromHistory( |
| 3955 | 'project-merge', 'org/project1').changes |
| 3956 | self.assertEqual(changes, '2,1 3,1 1,1') |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3957 | |
| 3958 | def test_crd_unshared_gate(self): |
| 3959 | "Test cross-repo dependencies in unshared gate queues" |
| 3960 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3961 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3962 | A.addApproval('code-review', 2) |
| 3963 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3964 | |
| 3965 | # A Depends-On: B |
| 3966 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 3967 | A.subject, B.data['id']) |
| 3968 | |
| 3969 | # A and B do not share a queue, make sure that A is unable to |
| 3970 | # enqueue B (and therefore, A is unable to be enqueued). |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3971 | B.addApproval('approved', 1) |
| 3972 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3973 | self.waitUntilSettled() |
| 3974 | |
| 3975 | self.assertEqual(A.data['status'], 'NEW') |
| 3976 | self.assertEqual(B.data['status'], 'NEW') |
| 3977 | self.assertEqual(A.reported, 0) |
| 3978 | self.assertEqual(B.reported, 0) |
| 3979 | self.assertEqual(len(self.history), 0) |
| 3980 | |
| 3981 | # Enqueue and merge B alone. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3982 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3983 | self.waitUntilSettled() |
| 3984 | |
| 3985 | self.assertEqual(B.data['status'], 'MERGED') |
| 3986 | self.assertEqual(B.reported, 2) |
| 3987 | |
| 3988 | # Now that B is merged, A should be able to be enqueued and |
| 3989 | # merged. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 3990 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 3991 | self.waitUntilSettled() |
| 3992 | |
| 3993 | self.assertEqual(A.data['status'], 'MERGED') |
| 3994 | self.assertEqual(A.reported, 2) |
| 3995 | |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 3996 | def test_crd_gate_reverse(self): |
| 3997 | "Test reverse cross-repo dependencies" |
| 3998 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 3999 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4000 | A.addApproval('code-review', 2) |
| 4001 | B.addApproval('code-review', 2) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4002 | |
| 4003 | # A Depends-On: B |
| 4004 | |
| 4005 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4006 | A.subject, B.data['id']) |
| 4007 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4008 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4009 | self.waitUntilSettled() |
| 4010 | |
| 4011 | self.assertEqual(A.data['status'], 'NEW') |
| 4012 | self.assertEqual(B.data['status'], 'NEW') |
| 4013 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4014 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4015 | A.addApproval('approved', 1) |
| 4016 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4017 | self.waitUntilSettled() |
| 4018 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4019 | self.launch_server.release('.*-merge') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4020 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4021 | self.launch_server.release('.*-merge') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4022 | self.waitUntilSettled() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4023 | self.launch_server.hold_jobs_in_build = False |
| 4024 | self.launch_server.release() |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4025 | self.waitUntilSettled() |
| 4026 | |
| 4027 | self.assertEqual(A.data['status'], 'MERGED') |
| 4028 | self.assertEqual(B.data['status'], 'MERGED') |
| 4029 | self.assertEqual(A.reported, 2) |
| 4030 | self.assertEqual(B.reported, 2) |
| 4031 | |
Paul Belanger | 5dccbe7 | 2016-11-14 11:17:37 -0500 | [diff] [blame] | 4032 | changes = self.getJobFromHistory( |
| 4033 | 'project-merge', 'org/project1').changes |
| 4034 | self.assertEqual(changes, '2,1 1,1') |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4035 | |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 4036 | def test_crd_cycle(self): |
| 4037 | "Test cross-repo dependency cycles" |
| 4038 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4039 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4040 | A.addApproval('code-review', 2) |
| 4041 | B.addApproval('code-review', 2) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 4042 | |
| 4043 | # A -> B -> A (via commit-depends) |
| 4044 | |
| 4045 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4046 | A.subject, B.data['id']) |
| 4047 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4048 | B.subject, A.data['id']) |
| 4049 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4050 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
James E. Blair | 5ee2425 | 2014-12-30 10:12:29 -0800 | [diff] [blame] | 4051 | self.waitUntilSettled() |
| 4052 | |
| 4053 | self.assertEqual(A.reported, 0) |
| 4054 | self.assertEqual(B.reported, 0) |
| 4055 | self.assertEqual(A.data['status'], 'NEW') |
| 4056 | self.assertEqual(B.data['status'], 'NEW') |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4057 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4058 | def test_crd_gate_unknown(self): |
| 4059 | "Test unknown projects in dependent pipeline" |
| 4060 | self.init_repo("org/unknown") |
| 4061 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4062 | B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'B') |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4063 | A.addApproval('code-review', 2) |
| 4064 | B.addApproval('code-review', 2) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4065 | |
| 4066 | # A Depends-On: B |
| 4067 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4068 | A.subject, B.data['id']) |
| 4069 | |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4070 | B.addApproval('approved', 1) |
| 4071 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4072 | self.waitUntilSettled() |
| 4073 | |
| 4074 | # Unknown projects cannot share a queue with any other |
| 4075 | # since they don't have common jobs with any other (they have no jobs). |
| 4076 | # Changes which depend on unknown project changes |
| 4077 | # should not be processed in dependent pipeline |
| 4078 | self.assertEqual(A.data['status'], 'NEW') |
| 4079 | self.assertEqual(B.data['status'], 'NEW') |
| 4080 | self.assertEqual(A.reported, 0) |
| 4081 | self.assertEqual(B.reported, 0) |
| 4082 | self.assertEqual(len(self.history), 0) |
| 4083 | |
| 4084 | # Simulate change B being gated outside this layout |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4085 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4086 | B.setMerged() |
| 4087 | self.waitUntilSettled() |
| 4088 | self.assertEqual(len(self.history), 0) |
| 4089 | |
| 4090 | # Now that B is merged, A should be able to be enqueued and |
| 4091 | # merged. |
James E. Blair | 8b5408c | 2016-08-08 15:37:46 -0700 | [diff] [blame] | 4092 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4093 | self.waitUntilSettled() |
| 4094 | |
| 4095 | self.assertEqual(A.data['status'], 'MERGED') |
| 4096 | self.assertEqual(A.reported, 2) |
| 4097 | self.assertEqual(B.data['status'], 'MERGED') |
| 4098 | self.assertEqual(B.reported, 0) |
| 4099 | |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4100 | def test_crd_check(self): |
| 4101 | "Test cross-repo dependencies in independent pipelines" |
| 4102 | |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4103 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4104 | self.gearman_server.hold_jobs_in_queue = True |
| 4105 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4106 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 4107 | |
| 4108 | # A Depends-On: B |
| 4109 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4110 | A.subject, B.data['id']) |
| 4111 | |
| 4112 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4113 | self.waitUntilSettled() |
| 4114 | |
| 4115 | queue = self.gearman_server.getQueue() |
| 4116 | ref = self.getParameter(queue[-1], 'ZUUL_REF') |
| 4117 | self.gearman_server.hold_jobs_in_queue = False |
| 4118 | self.gearman_server.release() |
| 4119 | self.waitUntilSettled() |
| 4120 | |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4121 | self.launch_server.release('.*-merge') |
| 4122 | self.waitUntilSettled() |
| 4123 | |
| 4124 | path = os.path.join(self.builds[0].jobdir.git_root, "org/project1") |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4125 | repo = git.Repo(path) |
| 4126 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 4127 | repo_messages.reverse() |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4128 | correct_messages = [ |
| 4129 | 'initial commit', 'add content from fixture', 'A-1'] |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4130 | self.assertEqual(repo_messages, correct_messages) |
| 4131 | |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4132 | path = os.path.join(self.builds[0].jobdir.git_root, "org/project2") |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4133 | repo = git.Repo(path) |
| 4134 | repo_messages = [c.message.strip() for c in repo.iter_commits(ref)] |
| 4135 | repo_messages.reverse() |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4136 | correct_messages = [ |
| 4137 | 'initial commit', 'add content from fixture', 'B-1'] |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4138 | self.assertEqual(repo_messages, correct_messages) |
| 4139 | |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4140 | self.launch_server.hold_jobs_in_build = False |
| 4141 | self.launch_server.release() |
| 4142 | self.waitUntilSettled() |
| 4143 | |
James E. Blair | bfb8e04 | 2014-12-30 17:01:44 -0800 | [diff] [blame] | 4144 | self.assertEqual(A.data['status'], 'NEW') |
| 4145 | self.assertEqual(B.data['status'], 'NEW') |
| 4146 | self.assertEqual(A.reported, 1) |
| 4147 | self.assertEqual(B.reported, 0) |
| 4148 | |
| 4149 | self.assertEqual(self.history[0].changes, '2,1 1,1') |
Paul Belanger | b30342b | 2016-11-14 12:30:43 -0500 | [diff] [blame] | 4150 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4151 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4152 | |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4153 | def test_crd_check_git_depends(self): |
| 4154 | "Test single-repo dependencies in independent pipelines" |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 4155 | self.gearman_server.hold_jobs_in_build = True |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4156 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4157 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 4158 | |
| 4159 | # Add two git-dependent changes and make sure they both report |
| 4160 | # success. |
| 4161 | B.setDependsOn(A, 1) |
| 4162 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4163 | self.waitUntilSettled() |
| 4164 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4165 | self.waitUntilSettled() |
| 4166 | |
James E. Blair | b8c1647 | 2015-05-05 14:55:26 -0700 | [diff] [blame] | 4167 | self.orderedRelease() |
| 4168 | self.gearman_server.hold_jobs_in_build = False |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4169 | self.waitUntilSettled() |
| 4170 | |
| 4171 | self.assertEqual(A.data['status'], 'NEW') |
| 4172 | self.assertEqual(B.data['status'], 'NEW') |
| 4173 | self.assertEqual(A.reported, 1) |
| 4174 | self.assertEqual(B.reported, 1) |
| 4175 | |
| 4176 | self.assertEqual(self.history[0].changes, '1,1') |
| 4177 | self.assertEqual(self.history[-1].changes, '1,1 2,1') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 4178 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4179 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4180 | |
| 4181 | self.assertIn('Build succeeded', A.messages[0]) |
| 4182 | self.assertIn('Build succeeded', B.messages[0]) |
| 4183 | |
| 4184 | def test_crd_check_duplicate(self): |
| 4185 | "Test duplicate check in independent pipelines" |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4186 | self.launch_server.hold_jobs_in_build = True |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4187 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4188 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 4189 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4190 | check_pipeline = tenant.layout.pipelines['check'] |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4191 | |
| 4192 | # Add two git-dependent changes... |
| 4193 | B.setDependsOn(A, 1) |
| 4194 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4195 | self.waitUntilSettled() |
| 4196 | self.assertEqual(len(check_pipeline.getAllItems()), 2) |
| 4197 | |
| 4198 | # ...make sure the live one is not duplicated... |
| 4199 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4200 | self.waitUntilSettled() |
| 4201 | self.assertEqual(len(check_pipeline.getAllItems()), 2) |
| 4202 | |
| 4203 | # ...but the non-live one is able to be. |
| 4204 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4205 | self.waitUntilSettled() |
| 4206 | self.assertEqual(len(check_pipeline.getAllItems()), 3) |
| 4207 | |
Clark Boylan | dd84982 | 2015-03-02 12:38:14 -0800 | [diff] [blame] | 4208 | # Release jobs in order to avoid races with change A jobs |
| 4209 | # finishing before change B jobs. |
James E. Blair | d765085 | 2015-05-07 15:47:37 -0700 | [diff] [blame] | 4210 | self.orderedRelease() |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4211 | self.launch_server.hold_jobs_in_build = False |
| 4212 | self.launch_server.release() |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4213 | self.waitUntilSettled() |
| 4214 | |
| 4215 | self.assertEqual(A.data['status'], 'NEW') |
| 4216 | self.assertEqual(B.data['status'], 'NEW') |
| 4217 | self.assertEqual(A.reported, 1) |
| 4218 | self.assertEqual(B.reported, 1) |
| 4219 | |
| 4220 | self.assertEqual(self.history[0].changes, '1,1 2,1') |
| 4221 | self.assertEqual(self.history[1].changes, '1,1') |
Paul Belanger | 0813696 | 2016-11-03 17:57:38 -0400 | [diff] [blame] | 4222 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | dbfe1cd | 2015-02-07 11:41:19 -0800 | [diff] [blame] | 4223 | |
| 4224 | self.assertIn('Build succeeded', A.messages[0]) |
| 4225 | self.assertIn('Build succeeded', B.messages[0]) |
| 4226 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4227 | def _test_crd_check_reconfiguration(self, project1, project2): |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4228 | "Test cross-repo dependencies re-enqueued in independent pipelines" |
| 4229 | |
| 4230 | self.gearman_server.hold_jobs_in_queue = True |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4231 | A = self.fake_gerrit.addFakeChange(project1, 'master', 'A') |
| 4232 | B = self.fake_gerrit.addFakeChange(project2, 'master', 'B') |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4233 | |
| 4234 | # A Depends-On: B |
| 4235 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4236 | A.subject, B.data['id']) |
| 4237 | |
| 4238 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4239 | self.waitUntilSettled() |
| 4240 | |
| 4241 | self.sched.reconfigure(self.config) |
| 4242 | |
| 4243 | # Make sure the items still share a change queue, and the |
| 4244 | # first one is not live. |
Paul Belanger | ce4485f | 2016-11-11 17:01:56 -0500 | [diff] [blame] | 4245 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4246 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 1) |
| 4247 | queue = tenant.layout.pipelines['check'].queues[0] |
James E. Blair | 8f78d88 | 2015-02-05 08:51:37 -0800 | [diff] [blame] | 4248 | first_item = queue.queue[0] |
| 4249 | for item in queue.queue: |
| 4250 | self.assertEqual(item.queue, first_item.queue) |
| 4251 | self.assertFalse(first_item.live) |
| 4252 | self.assertTrue(queue.queue[1].live) |
| 4253 | |
| 4254 | self.gearman_server.hold_jobs_in_queue = False |
| 4255 | self.gearman_server.release() |
| 4256 | self.waitUntilSettled() |
| 4257 | |
| 4258 | self.assertEqual(A.data['status'], 'NEW') |
| 4259 | self.assertEqual(B.data['status'], 'NEW') |
| 4260 | self.assertEqual(A.reported, 1) |
| 4261 | self.assertEqual(B.reported, 0) |
| 4262 | |
| 4263 | self.assertEqual(self.history[0].changes, '2,1 1,1') |
Paul Belanger | ce4485f | 2016-11-11 17:01:56 -0500 | [diff] [blame] | 4264 | self.assertEqual(len(tenant.layout.pipelines['check'].queues), 0) |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4265 | |
Evgeny Antyshev | 0deaaad | 2015-08-03 20:22:56 +0000 | [diff] [blame] | 4266 | def test_crd_check_reconfiguration(self): |
| 4267 | self._test_crd_check_reconfiguration('org/project1', 'org/project2') |
| 4268 | |
| 4269 | def test_crd_undefined_project(self): |
| 4270 | """Test that undefined projects in dependencies are handled for |
| 4271 | independent pipelines""" |
| 4272 | # It's a hack for fake gerrit, |
| 4273 | # as it implies repo creation upon the creation of any change |
| 4274 | self.init_repo("org/unknown") |
| 4275 | self._test_crd_check_reconfiguration('org/project1', 'org/unknown') |
| 4276 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 4277 | @skip("Disabled for early v3 development") |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4278 | def test_crd_check_ignore_dependencies(self): |
| 4279 | "Test cross-repo dependencies can be ignored" |
James E. Blair | f84026c | 2015-12-08 16:11:46 -0800 | [diff] [blame] | 4280 | self.updateConfigLayout( |
| 4281 | 'tests/fixtures/layout-ignore-dependencies.yaml') |
James E. Blair | 17dd677 | 2015-02-09 14:45:18 -0800 | [diff] [blame] | 4282 | self.sched.reconfigure(self.config) |
| 4283 | self.registerJobs() |
| 4284 | |
| 4285 | self.gearman_server.hold_jobs_in_queue = True |
| 4286 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4287 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 4288 | C = self.fake_gerrit.addFakeChange('org/project2', 'master', 'C') |
| 4289 | |
| 4290 | # A Depends-On: B |
| 4291 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4292 | A.subject, B.data['id']) |
| 4293 | # C git-depends on B |
| 4294 | C.setDependsOn(B, 1) |
| 4295 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4296 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4297 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4298 | self.waitUntilSettled() |
| 4299 | |
| 4300 | # Make sure none of the items share a change queue, and all |
| 4301 | # are live. |
| 4302 | check_pipeline = self.sched.layout.pipelines['check'] |
| 4303 | self.assertEqual(len(check_pipeline.queues), 3) |
| 4304 | self.assertEqual(len(check_pipeline.getAllItems()), 3) |
| 4305 | for item in check_pipeline.getAllItems(): |
| 4306 | self.assertTrue(item.live) |
| 4307 | |
| 4308 | self.gearman_server.hold_jobs_in_queue = False |
| 4309 | self.gearman_server.release() |
| 4310 | self.waitUntilSettled() |
| 4311 | |
| 4312 | self.assertEqual(A.data['status'], 'NEW') |
| 4313 | self.assertEqual(B.data['status'], 'NEW') |
| 4314 | self.assertEqual(C.data['status'], 'NEW') |
| 4315 | self.assertEqual(A.reported, 1) |
| 4316 | self.assertEqual(B.reported, 1) |
| 4317 | self.assertEqual(C.reported, 1) |
| 4318 | |
| 4319 | # Each job should have tested exactly one change |
| 4320 | for job in self.history: |
| 4321 | self.assertEqual(len(job.changes.split()), 1) |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4322 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 4323 | @skip("Disabled for early v3 development") |
James E. Blair | 96698e2 | 2015-04-02 07:48:21 -0700 | [diff] [blame] | 4324 | def test_crd_check_transitive(self): |
| 4325 | "Test transitive cross-repo dependencies" |
| 4326 | # Specifically, if A -> B -> C, and C gets a new patchset and |
| 4327 | # A gets a new patchset, ensure the test of A,2 includes B,1 |
| 4328 | # and C,2 (not C,1 which would indicate stale data in the |
| 4329 | # cache for B). |
| 4330 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4331 | B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B') |
| 4332 | C = self.fake_gerrit.addFakeChange('org/project3', 'master', 'C') |
| 4333 | |
| 4334 | # A Depends-On: B |
| 4335 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4336 | A.subject, B.data['id']) |
| 4337 | |
| 4338 | # B Depends-On: C |
| 4339 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4340 | B.subject, C.data['id']) |
| 4341 | |
| 4342 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4343 | self.waitUntilSettled() |
| 4344 | self.assertEqual(self.history[-1].changes, '3,1 2,1 1,1') |
| 4345 | |
| 4346 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4347 | self.waitUntilSettled() |
| 4348 | self.assertEqual(self.history[-1].changes, '3,1 2,1') |
| 4349 | |
| 4350 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4351 | self.waitUntilSettled() |
| 4352 | self.assertEqual(self.history[-1].changes, '3,1') |
| 4353 | |
| 4354 | C.addPatchset() |
| 4355 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(2)) |
| 4356 | self.waitUntilSettled() |
| 4357 | self.assertEqual(self.history[-1].changes, '3,2') |
| 4358 | |
| 4359 | A.addPatchset() |
| 4360 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(2)) |
| 4361 | self.waitUntilSettled() |
| 4362 | self.assertEqual(self.history[-1].changes, '3,2 2,1 1,2') |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4363 | |
James E. Blair | a8b90b3 | 2016-08-24 15:18:50 -0700 | [diff] [blame] | 4364 | def test_crd_check_unknown(self): |
| 4365 | "Test unknown projects in independent pipeline" |
| 4366 | self.init_repo("org/unknown") |
| 4367 | A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A') |
| 4368 | B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D') |
| 4369 | # A Depends-On: B |
| 4370 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4371 | A.subject, B.data['id']) |
| 4372 | |
| 4373 | # Make sure zuul has seen an event on B. |
| 4374 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4375 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4376 | self.waitUntilSettled() |
| 4377 | |
| 4378 | self.assertEqual(A.data['status'], 'NEW') |
| 4379 | self.assertEqual(A.reported, 1) |
| 4380 | self.assertEqual(B.data['status'], 'NEW') |
| 4381 | self.assertEqual(B.reported, 0) |
| 4382 | |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4383 | def test_crd_cycle_join(self): |
| 4384 | "Test an updated change creates a cycle" |
| 4385 | A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A') |
| 4386 | |
| 4387 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4388 | self.waitUntilSettled() |
| 4389 | |
| 4390 | # Create B->A |
| 4391 | B = self.fake_gerrit.addFakeChange('org/project1', 'master', 'B') |
| 4392 | B.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4393 | B.subject, A.data['id']) |
| 4394 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4395 | self.waitUntilSettled() |
| 4396 | |
| 4397 | # Update A to add A->B (a cycle). |
| 4398 | A.addPatchset() |
| 4399 | A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % ( |
| 4400 | A.subject, B.data['id']) |
| 4401 | # Normally we would submit the patchset-created event for |
| 4402 | # processing here, however, we have no way of noting whether |
| 4403 | # the dependency cycle detection correctly raised an |
| 4404 | # exception, so instead, we reach into the source driver and |
| 4405 | # call the method that would ultimately be called by the event |
| 4406 | # processing. |
| 4407 | |
Paul Belanger | 0e155e2 | 2016-11-14 14:12:23 -0500 | [diff] [blame] | 4408 | tenant = self.sched.abide.tenants.get('tenant-one') |
| 4409 | source = tenant.layout.pipelines['gate'].source |
| 4410 | |
| 4411 | # TODO(pabelanger): As we add more source / trigger APIs we should make |
| 4412 | # it easier for users to create events for testing. |
| 4413 | event = zuul.model.TriggerEvent() |
| 4414 | event.trigger_name = 'gerrit' |
| 4415 | event.change_number = '1' |
| 4416 | event.patch_number = '2' |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4417 | with testtools.ExpectedException( |
| 4418 | Exception, "Dependency cycle detected"): |
Paul Belanger | 0e155e2 | 2016-11-14 14:12:23 -0500 | [diff] [blame] | 4419 | source.getChange(event, True) |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4420 | self.log.debug("Got expected dependency cycle exception") |
| 4421 | |
| 4422 | # Now if we update B to remove the depends-on, everything |
| 4423 | # should be okay. B; A->B |
| 4424 | |
| 4425 | B.addPatchset() |
| 4426 | B.data['commitMessage'] = '%s\n' % (B.subject,) |
Paul Belanger | 0e155e2 | 2016-11-14 14:12:23 -0500 | [diff] [blame] | 4427 | |
| 4428 | source.getChange(event, True) |
| 4429 | event.change_number = '2' |
| 4430 | source.getChange(event, True) |
James E. Blair | 92464a2 | 2016-04-05 10:21:26 -0700 | [diff] [blame] | 4431 | |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4432 | def test_disable_at(self): |
| 4433 | "Test a pipeline will only report to the disabled trigger when failing" |
| 4434 | |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4435 | self.updateConfigLayout('layout-disabled-at') |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4436 | self.sched.reconfigure(self.config) |
| 4437 | |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4438 | tenant = self.sched.abide.tenants.get('openstack') |
| 4439 | self.assertEqual(3, tenant.layout.pipelines['check'].disable_at) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4440 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4441 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4442 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4443 | |
| 4444 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4445 | B = self.fake_gerrit.addFakeChange('org/project', 'master', 'B') |
| 4446 | C = self.fake_gerrit.addFakeChange('org/project', 'master', 'C') |
| 4447 | D = self.fake_gerrit.addFakeChange('org/project', 'master', 'D') |
| 4448 | E = self.fake_gerrit.addFakeChange('org/project', 'master', 'E') |
| 4449 | F = self.fake_gerrit.addFakeChange('org/project', 'master', 'F') |
| 4450 | G = self.fake_gerrit.addFakeChange('org/project', 'master', 'G') |
| 4451 | H = self.fake_gerrit.addFakeChange('org/project', 'master', 'H') |
| 4452 | I = self.fake_gerrit.addFakeChange('org/project', 'master', 'I') |
| 4453 | J = self.fake_gerrit.addFakeChange('org/project', 'master', 'J') |
| 4454 | K = self.fake_gerrit.addFakeChange('org/project', 'master', 'K') |
| 4455 | |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4456 | self.launch_server.failJob('project-test1', A) |
| 4457 | self.launch_server.failJob('project-test1', B) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4458 | # Let C pass, resetting the counter |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4459 | self.launch_server.failJob('project-test1', D) |
| 4460 | self.launch_server.failJob('project-test1', E) |
| 4461 | self.launch_server.failJob('project-test1', F) |
| 4462 | self.launch_server.failJob('project-test1', G) |
| 4463 | self.launch_server.failJob('project-test1', H) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4464 | # I also passes but should only report to the disabled reporters |
James E. Blair | 08d1999 | 2016-08-10 15:25:31 -0700 | [diff] [blame] | 4465 | self.launch_server.failJob('project-test1', J) |
| 4466 | self.launch_server.failJob('project-test1', K) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4467 | |
| 4468 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4469 | self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1)) |
| 4470 | self.waitUntilSettled() |
| 4471 | |
| 4472 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4473 | 2, tenant.layout.pipelines['check']._consecutive_failures) |
| 4474 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4475 | |
| 4476 | self.fake_gerrit.addEvent(C.getPatchsetCreatedEvent(1)) |
| 4477 | self.waitUntilSettled() |
| 4478 | |
| 4479 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4480 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4481 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4482 | |
| 4483 | self.fake_gerrit.addEvent(D.getPatchsetCreatedEvent(1)) |
| 4484 | self.fake_gerrit.addEvent(E.getPatchsetCreatedEvent(1)) |
| 4485 | self.fake_gerrit.addEvent(F.getPatchsetCreatedEvent(1)) |
| 4486 | self.waitUntilSettled() |
| 4487 | |
| 4488 | # We should be disabled now |
| 4489 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4490 | 3, tenant.layout.pipelines['check']._consecutive_failures) |
| 4491 | self.assertTrue(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4492 | |
| 4493 | # We need to wait between each of these patches to make sure the |
| 4494 | # smtp messages come back in an expected order |
| 4495 | self.fake_gerrit.addEvent(G.getPatchsetCreatedEvent(1)) |
| 4496 | self.waitUntilSettled() |
| 4497 | self.fake_gerrit.addEvent(H.getPatchsetCreatedEvent(1)) |
| 4498 | self.waitUntilSettled() |
| 4499 | self.fake_gerrit.addEvent(I.getPatchsetCreatedEvent(1)) |
| 4500 | self.waitUntilSettled() |
| 4501 | |
| 4502 | # The first 6 (ABCDEF) jobs should have reported back to gerrt thus |
| 4503 | # leaving a message on each change |
| 4504 | self.assertEqual(1, len(A.messages)) |
| 4505 | self.assertIn('Build failed.', A.messages[0]) |
| 4506 | self.assertEqual(1, len(B.messages)) |
| 4507 | self.assertIn('Build failed.', B.messages[0]) |
| 4508 | self.assertEqual(1, len(C.messages)) |
| 4509 | self.assertIn('Build succeeded.', C.messages[0]) |
| 4510 | self.assertEqual(1, len(D.messages)) |
| 4511 | self.assertIn('Build failed.', D.messages[0]) |
| 4512 | self.assertEqual(1, len(E.messages)) |
| 4513 | self.assertIn('Build failed.', E.messages[0]) |
| 4514 | self.assertEqual(1, len(F.messages)) |
| 4515 | self.assertIn('Build failed.', F.messages[0]) |
| 4516 | |
| 4517 | # The last 3 (GHI) would have only reported via smtp. |
| 4518 | self.assertEqual(3, len(self.smtp_messages)) |
| 4519 | self.assertEqual(0, len(G.messages)) |
| 4520 | self.assertIn('Build failed.', self.smtp_messages[0]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4521 | self.assertIn( |
| 4522 | 'project-test1 https://server/job', self.smtp_messages[0]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4523 | self.assertEqual(0, len(H.messages)) |
| 4524 | self.assertIn('Build failed.', self.smtp_messages[1]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4525 | self.assertIn( |
| 4526 | 'project-test1 https://server/job', self.smtp_messages[1]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4527 | self.assertEqual(0, len(I.messages)) |
| 4528 | self.assertIn('Build succeeded.', self.smtp_messages[2]['body']) |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4529 | self.assertIn( |
| 4530 | 'project-test1 https://server/job', self.smtp_messages[2]['body']) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4531 | |
| 4532 | # Now reload the configuration (simulate a HUP) to check the pipeline |
| 4533 | # comes out of disabled |
| 4534 | self.sched.reconfigure(self.config) |
| 4535 | |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4536 | tenant = self.sched.abide.tenants.get('openstack') |
| 4537 | |
| 4538 | self.assertEqual(3, tenant.layout.pipelines['check'].disable_at) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4539 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4540 | 0, tenant.layout.pipelines['check']._consecutive_failures) |
| 4541 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4542 | |
| 4543 | self.fake_gerrit.addEvent(J.getPatchsetCreatedEvent(1)) |
| 4544 | self.fake_gerrit.addEvent(K.getPatchsetCreatedEvent(1)) |
| 4545 | self.waitUntilSettled() |
| 4546 | |
| 4547 | self.assertEqual( |
Paul Belanger | 7dc76e8 | 2016-11-11 16:51:08 -0500 | [diff] [blame] | 4548 | 2, tenant.layout.pipelines['check']._consecutive_failures) |
| 4549 | self.assertFalse(tenant.layout.pipelines['check']._disabled) |
Joshua Hesketh | 89e829d | 2015-02-10 16:29:45 +1100 | [diff] [blame] | 4550 | |
| 4551 | # J and K went back to gerrit |
| 4552 | self.assertEqual(1, len(J.messages)) |
| 4553 | self.assertIn('Build failed.', J.messages[0]) |
| 4554 | self.assertEqual(1, len(K.messages)) |
| 4555 | self.assertIn('Build failed.', K.messages[0]) |
| 4556 | # No more messages reported via smtp |
| 4557 | self.assertEqual(3, len(self.smtp_messages)) |
Joshua Hesketh | d6dbd68 | 2015-12-22 10:06:54 +1100 | [diff] [blame] | 4558 | |
James E. Blair | ec05649 | 2016-07-22 09:45:56 -0700 | [diff] [blame] | 4559 | @skip("Disabled for early v3 development") |
Paul Belanger | 71d9817 | 2016-11-08 10:56:31 -0500 | [diff] [blame] | 4560 | def test_rerun_on_abort(self): |
| 4561 | "Test that if a worker fails to run a job, it is run again" |
| 4562 | |
| 4563 | self.config.set('zuul', 'layout_config', |
| 4564 | 'tests/fixtures/layout-abort-attempts.yaml') |
| 4565 | self.sched.reconfigure(self.config) |
| 4566 | self.worker.hold_jobs_in_build = True |
| 4567 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4568 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4569 | self.waitUntilSettled() |
| 4570 | |
| 4571 | self.worker.release('.*-merge') |
| 4572 | self.waitUntilSettled() |
| 4573 | |
| 4574 | self.assertEqual(len(self.builds), 2) |
| 4575 | self.builds[0].requeue = True |
| 4576 | self.worker.release('.*-test*') |
| 4577 | self.waitUntilSettled() |
| 4578 | |
| 4579 | for x in range(3): |
| 4580 | self.assertEqual(len(self.builds), 1) |
| 4581 | self.builds[0].requeue = True |
| 4582 | self.worker.release('.*-test1') |
| 4583 | self.waitUntilSettled() |
| 4584 | |
| 4585 | self.worker.hold_jobs_in_build = False |
| 4586 | self.worker.release() |
| 4587 | self.waitUntilSettled() |
| 4588 | self.assertEqual(len(self.history), 6) |
| 4589 | self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 2) |
| 4590 | self.assertEqual(A.reported, 1) |
| 4591 | self.assertIn('RETRY_LIMIT', A.messages[0]) |
Joshua Hesketh | 3f7def3 | 2016-11-21 17:36:44 +1100 | [diff] [blame] | 4592 | |
Arie | b6f068c | 2016-10-09 13:11:06 +0300 | [diff] [blame] | 4593 | |
| 4594 | class TestDuplicatePipeline(ZuulTestCase): |
| 4595 | tenant_config_file = 'config/duplicate-pipeline/main.yaml' |
| 4596 | |
| 4597 | def test_duplicate_pipelines(self): |
| 4598 | "Test that a change matching multiple pipelines works" |
| 4599 | |
| 4600 | A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A') |
| 4601 | self.fake_gerrit.addEvent(A.getChangeRestoredEvent()) |
| 4602 | self.waitUntilSettled() |
| 4603 | |
| 4604 | self.assertHistory([ |
| 4605 | dict(name='project-test1', result='SUCCESS', changes='1,1', |
| 4606 | pipeline='dup1'), |
| 4607 | dict(name='project-test1', result='SUCCESS', changes='1,1', |
| 4608 | pipeline='dup2'), |
Paul Belanger | 73a7d8e | 2016-11-09 11:12:42 -0500 | [diff] [blame] | 4609 | ], ordered=False) |
Arie | b6f068c | 2016-10-09 13:11:06 +0300 | [diff] [blame] | 4610 | |
| 4611 | self.assertEqual(len(A.messages), 2) |
| 4612 | |
Paul Belanger | a46a374 | 2016-11-09 14:23:03 -0500 | [diff] [blame] | 4613 | if 'dup1' in A.messages[0]: |
| 4614 | self.assertIn('dup1', A.messages[0]) |
| 4615 | self.assertNotIn('dup2', A.messages[0]) |
| 4616 | self.assertIn('project-test1', A.messages[0]) |
| 4617 | self.assertIn('dup2', A.messages[1]) |
| 4618 | self.assertNotIn('dup1', A.messages[1]) |
| 4619 | self.assertIn('project-test1', A.messages[1]) |
| 4620 | else: |
| 4621 | self.assertIn('dup1', A.messages[1]) |
| 4622 | self.assertNotIn('dup2', A.messages[1]) |
| 4623 | self.assertIn('project-test1', A.messages[1]) |
| 4624 | self.assertIn('dup2', A.messages[0]) |
| 4625 | self.assertNotIn('dup1', A.messages[0]) |
| 4626 | self.assertIn('project-test1', A.messages[0]) |
Paul Belanger | fac69ba | 2016-11-03 09:03:13 -0400 | [diff] [blame] | 4627 | |
| 4628 | |
| 4629 | class TestSchedulerOneJobProject(ZuulTestCase): |
| 4630 | tenant_config_file = 'config/one-job-project/main.yaml' |
| 4631 | |
| 4632 | def test_one_job_project(self): |
| 4633 | "Test that queueing works with one job" |
| 4634 | A = self.fake_gerrit.addFakeChange('org/one-job-project', |
| 4635 | 'master', 'A') |
| 4636 | B = self.fake_gerrit.addFakeChange('org/one-job-project', |
| 4637 | 'master', 'B') |
| 4638 | A.addApproval('code-review', 2) |
| 4639 | B.addApproval('code-review', 2) |
| 4640 | self.fake_gerrit.addEvent(A.addApproval('approved', 1)) |
| 4641 | self.fake_gerrit.addEvent(B.addApproval('approved', 1)) |
| 4642 | self.waitUntilSettled() |
| 4643 | |
| 4644 | self.assertEqual(A.data['status'], 'MERGED') |
| 4645 | self.assertEqual(A.reported, 2) |
| 4646 | self.assertEqual(B.data['status'], 'MERGED') |
| 4647 | self.assertEqual(B.reported, 2) |
Paul Belanger | 86085b3 | 2016-11-03 12:48:57 -0400 | [diff] [blame] | 4648 | |
| 4649 | |
| 4650 | class TestSchedulerTemplatedProject(ZuulTestCase): |
| 4651 | tenant_config_file = 'config/templated-project/main.yaml' |
| 4652 | |
| 4653 | def test_job_from_templates_launched(self): |
| 4654 | "Test whether a job generated via a template can be launched" |
| 4655 | |
| 4656 | A = self.fake_gerrit.addFakeChange( |
| 4657 | 'org/templated-project', 'master', 'A') |
| 4658 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4659 | self.waitUntilSettled() |
| 4660 | |
| 4661 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 4662 | 'SUCCESS') |
| 4663 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 4664 | 'SUCCESS') |
Paul Belanger | 3adf72f | 2016-11-03 14:57:31 -0400 | [diff] [blame] | 4665 | |
| 4666 | def test_layered_templates(self): |
| 4667 | "Test whether a job generated via a template can be launched" |
| 4668 | |
| 4669 | A = self.fake_gerrit.addFakeChange( |
| 4670 | 'org/layered-project', 'master', 'A') |
| 4671 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4672 | self.waitUntilSettled() |
| 4673 | |
| 4674 | self.assertEqual(self.getJobFromHistory('project-test1').result, |
| 4675 | 'SUCCESS') |
| 4676 | self.assertEqual(self.getJobFromHistory('project-test2').result, |
| 4677 | 'SUCCESS') |
| 4678 | self.assertEqual(self.getJobFromHistory('layered-project-test3' |
| 4679 | ).result, 'SUCCESS') |
| 4680 | self.assertEqual(self.getJobFromHistory('layered-project-test4' |
| 4681 | ).result, 'SUCCESS') |
| 4682 | self.assertEqual(self.getJobFromHistory('layered-project-foo-test5' |
| 4683 | ).result, 'SUCCESS') |
| 4684 | self.assertEqual(self.getJobFromHistory('project-test6').result, |
| 4685 | 'SUCCESS') |
Adam Gandelman | 94a6006 | 2016-11-21 16:43:14 -0800 | [diff] [blame^] | 4686 | |
| 4687 | |
| 4688 | class TestSchedulerSuccessURL(ZuulTestCase): |
| 4689 | tenant_config_file = 'config/success-url/main.yaml' |
| 4690 | |
| 4691 | def test_success_url(self): |
| 4692 | "Ensure bad build params are ignored" |
| 4693 | self.sched.reconfigure(self.config) |
| 4694 | self.init_repo('org/docs') |
| 4695 | |
| 4696 | A = self.fake_gerrit.addFakeChange('org/docs', 'master', 'A') |
| 4697 | self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1)) |
| 4698 | self.waitUntilSettled() |
| 4699 | |
| 4700 | # Both builds ran: docs-draft-test + docs-draft-test2 |
| 4701 | self.assertEqual(len(self.history), 2) |
| 4702 | |
| 4703 | # Grab build id |
| 4704 | uuid = self.history[0].uuid[:7] |
| 4705 | |
| 4706 | # Two msgs: 'Starting...' + results |
| 4707 | self.assertEqual(len(self.smtp_messages), 2) |
| 4708 | body = self.smtp_messages[1]['body'].splitlines() |
| 4709 | self.assertEqual('Build succeeded.', body[0]) |
| 4710 | |
| 4711 | self.assertIn( |
| 4712 | '- docs-draft-test http://docs-draft.example.org/1/1/1/check/' |
| 4713 | 'docs-draft-test/%s/publish-docs/' % uuid, |
| 4714 | body[2]) |
| 4715 | |
| 4716 | # NOTE: This default URL is currently hard-coded in launcher/server.py |
| 4717 | self.assertIn( |
| 4718 | '- docs-draft-test2 https://server/job', |
| 4719 | body[3]) |