Merge "Fix flaky deduplication test"

This commit is contained in:
Zuul 2023-11-20 15:34:01 +00:00 committed by Gerrit Code Review
commit 7fae80f574
1 changed files with 2 additions and 0 deletions

View File

@ -5780,6 +5780,7 @@ class QueueItem(zkobject.ZKObject):
log.info("Deduplicating request of bundle job %s for item %s "
"with item %s", job, self, other_item)
build_set.setJobNodeRequestDuplicate(job.name, other_item)
job._set(_ready_to_run=False)
# Handle provisioned nodes
other_nodeset = other_build_set.getJobNodeSetInfo(job.name)
@ -5792,6 +5793,7 @@ class QueueItem(zkobject.ZKObject):
log.info("Deduplicating nodeset of bundle job %s for item %s "
"with item %s", job, self, other_item)
build_set.setJobNodeSetInfoDuplicate(job.name, other_item)
job._set(_ready_to_run=False)
# Handle builds
other_build = other_build_set.getBuild(job.name)