Merge "Fix test_rerun_on_abort" into feature/zuulv3
This commit is contained in:
commit
f84b1c232d
|
@ -65,6 +65,7 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: project-test1
|
name: project-test1
|
||||||
|
attempts: 4
|
||||||
nodes:
|
nodes:
|
||||||
- name: controller
|
- name: controller
|
||||||
image: image1
|
image: image1
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
pipelines:
|
|
||||||
- name: check
|
|
||||||
manager: IndependentPipelineManager
|
|
||||||
trigger:
|
|
||||||
gerrit:
|
|
||||||
- event: patchset-created
|
|
||||||
success:
|
|
||||||
gerrit:
|
|
||||||
verified: 1
|
|
||||||
failure:
|
|
||||||
gerrit:
|
|
||||||
verified: -1
|
|
||||||
|
|
||||||
- name: post
|
|
||||||
manager: IndependentPipelineManager
|
|
||||||
trigger:
|
|
||||||
gerrit:
|
|
||||||
- event: ref-updated
|
|
||||||
ref: ^(?!refs/).*$
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
- name: project-test1
|
|
||||||
attempts: 4
|
|
||||||
|
|
||||||
projects:
|
|
||||||
- name: org/project
|
|
||||||
check:
|
|
||||||
- project-merge:
|
|
||||||
- project-test1
|
|
||||||
- project-test2
|
|
|
@ -4501,9 +4501,6 @@ For CI problems and help debugging, contact ci@example.org"""
|
||||||
def test_rerun_on_abort(self):
|
def test_rerun_on_abort(self):
|
||||||
"Test that if a launch server fails to run a job, it is run again"
|
"Test that if a launch server fails to run a job, it is run again"
|
||||||
|
|
||||||
self.config.set('zuul', 'layout_config',
|
|
||||||
'tests/fixtures/layout-abort-attempts.yaml')
|
|
||||||
self.sched.reconfigure(self.config)
|
|
||||||
self.launch_server.hold_jobs_in_build = True
|
self.launch_server.hold_jobs_in_build = True
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||||
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
||||||
|
|
|
@ -100,6 +100,7 @@ class JobParser(object):
|
||||||
'irrelevant-files': to_list(str),
|
'irrelevant-files': to_list(str),
|
||||||
'nodes': vs.Any([node], str),
|
'nodes': vs.Any([node], str),
|
||||||
'timeout': int,
|
'timeout': int,
|
||||||
|
'attempts': int,
|
||||||
'_source_project': model.Project,
|
'_source_project': model.Project,
|
||||||
'_source_branch': vs.Any(str, None),
|
'_source_branch': vs.Any(str, None),
|
||||||
}
|
}
|
||||||
|
|
|
@ -666,7 +666,7 @@ class BuildSet(object):
|
||||||
def addBuild(self, build):
|
def addBuild(self, build):
|
||||||
self.builds[build.job.name] = build
|
self.builds[build.job.name] = build
|
||||||
if build.job.name not in self.tries:
|
if build.job.name not in self.tries:
|
||||||
self.tries[build.job.name] = 0
|
self.tries[build.job.name] = 1
|
||||||
build.build_set = self
|
build.build_set = self
|
||||||
|
|
||||||
def removeBuild(self, build):
|
def removeBuild(self, build):
|
||||||
|
|
Loading…
Reference in New Issue