Move test_tags to simple_layout
Change-Id: Ia5c2e8ea99523fa043f4e8b8aa0e15a4dc25200d
This commit is contained in:
parent
6df6713435
commit
e68d43faff
|
@ -1,2 +0,0 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -1,2 +0,0 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -1,2 +0,0 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -1,2 +0,0 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -1,54 +0,0 @@
|
|||
- pipeline:
|
||||
name: check
|
||||
manager: independent
|
||||
trigger:
|
||||
gerrit:
|
||||
- event: patchset-created
|
||||
success:
|
||||
gerrit:
|
||||
verified: 1
|
||||
failure:
|
||||
gerrit:
|
||||
verified: -1
|
||||
|
||||
- job:
|
||||
name: merge
|
||||
failure-message: Unable to merge change
|
||||
hold-following-changes: true
|
||||
tags:
|
||||
- merge
|
||||
|
||||
- job:
|
||||
name: test1
|
||||
|
||||
- job:
|
||||
name: test2
|
||||
|
||||
- job:
|
||||
name: integration
|
||||
|
||||
- project:
|
||||
name: org/project1
|
||||
check:
|
||||
jobs:
|
||||
- merge:
|
||||
tags:
|
||||
- extratag
|
||||
- test1:
|
||||
dependencies: merge
|
||||
- test2:
|
||||
dependencies: merge
|
||||
- integration:
|
||||
dependencies: merge
|
||||
|
||||
- project:
|
||||
name: org/project2
|
||||
check:
|
||||
jobs:
|
||||
- merge
|
||||
- test1:
|
||||
dependencies: merge
|
||||
- test2:
|
||||
dependencies: merge
|
||||
- integration:
|
||||
dependencies: merge
|
|
@ -0,0 +1,31 @@
|
|||
- pipeline:
|
||||
name: check
|
||||
manager: independent
|
||||
trigger:
|
||||
gerrit:
|
||||
- event: patchset-created
|
||||
success:
|
||||
gerrit:
|
||||
verified: 1
|
||||
failure:
|
||||
gerrit:
|
||||
verified: -1
|
||||
|
||||
- job:
|
||||
name: merge
|
||||
tags:
|
||||
- merge
|
||||
|
||||
- project:
|
||||
name: org/project1
|
||||
check:
|
||||
jobs:
|
||||
- merge:
|
||||
tags:
|
||||
- extratag
|
||||
|
||||
- project:
|
||||
name: org/project2
|
||||
check:
|
||||
jobs:
|
||||
- merge
|
|
@ -2921,18 +2921,16 @@ class TestScheduler(ZuulTestCase):
|
|||
self.assertEqual(B.data['status'], 'MERGED')
|
||||
self.assertEqual(B.reported, 2)
|
||||
|
||||
@simple_layout('layouts/tags.yaml')
|
||||
def test_tags(self):
|
||||
"Test job tags"
|
||||
self.updateConfigLayout('layout-tags')
|
||||
self.sched.reconfigure(self.config)
|
||||
|
||||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
||||
B = self.fake_gerrit.addFakeChange('org/project2', 'master', 'B')
|
||||
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
||||
self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
|
||||
self.waitUntilSettled()
|
||||
|
||||
self.assertEqual(len(self.history), 8)
|
||||
self.assertEqual(len(self.history), 2)
|
||||
|
||||
results = {self.getJobFromHistory('merge',
|
||||
project='org/project1').uuid: 'extratag merge',
|
||||
|
|
Loading…
Reference in New Issue