Merge "Re-enable test_tags" into feature/zuulv3
This commit is contained in:
commit
56f5d95847
2
tests/fixtures/config/single-tenant/git/layout-tags/playbooks/integration.yaml
vendored
Normal file
2
tests/fixtures/config/single-tenant/git/layout-tags/playbooks/integration.yaml
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -0,0 +1,2 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -0,0 +1,2 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -0,0 +1,2 @@
|
|||
- hosts: all
|
||||
tasks: []
|
|
@ -0,0 +1,52 @@
|
|||
- pipeline:
|
||||
name: check
|
||||
manager: independent
|
||||
source:
|
||||
gerrit
|
||||
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:
|
||||
jobs:
|
||||
- test1
|
||||
- test2
|
||||
- integration
|
||||
tags:
|
||||
- extratag
|
||||
|
||||
- project:
|
||||
name: org/project2
|
||||
check:
|
||||
jobs:
|
||||
- merge:
|
||||
jobs:
|
||||
- test1
|
||||
- test2
|
||||
- integration
|
|
@ -1,42 +0,0 @@
|
|||
includes:
|
||||
- python-file: tags_custom_functions.py
|
||||
|
||||
pipelines:
|
||||
- name: check
|
||||
manager: IndependentPipelineManager
|
||||
trigger:
|
||||
gerrit:
|
||||
- event: patchset-created
|
||||
success:
|
||||
gerrit:
|
||||
verified: 1
|
||||
failure:
|
||||
gerrit:
|
||||
verified: -1
|
||||
|
||||
jobs:
|
||||
- name: ^.*$
|
||||
parameter-function: apply_tags
|
||||
- name: ^.*-merge$
|
||||
failure-message: Unable to merge change
|
||||
hold-following-changes: true
|
||||
tags: merge
|
||||
- name: project1-merge
|
||||
tags:
|
||||
- project1
|
||||
- extratag
|
||||
|
||||
projects:
|
||||
- name: org/project1
|
||||
check:
|
||||
- project1-merge:
|
||||
- project1-test1
|
||||
- project1-test2
|
||||
- project1-project2-integration
|
||||
|
||||
- name: org/project2
|
||||
check:
|
||||
- project2-merge:
|
||||
- project2-test1
|
||||
- project2-test2
|
||||
- project1-project2-integration
|
|
@ -1,2 +0,0 @@
|
|||
def apply_tags(item, job, params):
|
||||
params['BUILD_TAGS'] = ' '.join(sorted(job.tags))
|
|
@ -2753,11 +2753,9 @@ class TestScheduler(ZuulTestCase):
|
|||
self.assertEqual(B.data['status'], 'MERGED')
|
||||
self.assertEqual(B.reported, 2)
|
||||
|
||||
@skip("Disabled for early v3 development")
|
||||
def test_tags(self):
|
||||
"Test job tags"
|
||||
self.config.set('zuul', 'layout_config',
|
||||
'tests/fixtures/layout-tags.yaml')
|
||||
self.updateConfigLayout('layout-tags')
|
||||
self.sched.reconfigure(self.config)
|
||||
|
||||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
||||
|
@ -2766,12 +2764,16 @@ class TestScheduler(ZuulTestCase):
|
|||
self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
|
||||
self.waitUntilSettled()
|
||||
|
||||
results = {'project1-merge': 'extratag merge project1',
|
||||
'project2-merge': 'merge'}
|
||||
self.assertEqual(len(self.history), 8)
|
||||
|
||||
results = {self.getJobFromHistory('merge',
|
||||
project='org/project1').uuid: 'extratag merge',
|
||||
self.getJobFromHistory('merge',
|
||||
project='org/project2').uuid: 'merge'}
|
||||
|
||||
for build in self.history:
|
||||
self.assertEqual(results.get(build.name, ''),
|
||||
build.parameters.get('BUILD_TAGS'))
|
||||
self.assertEqual(results.get(build.uuid, ''),
|
||||
build.parameters['vars']['zuul'].get('tags'))
|
||||
|
||||
def test_timer(self):
|
||||
"Test that a periodic job is triggered"
|
||||
|
|
|
@ -225,7 +225,9 @@ class LaunchClient(object):
|
|||
zuul_params = dict(uuid=uuid,
|
||||
pipeline=pipeline.name,
|
||||
job=job.name,
|
||||
project=item.change.project.name)
|
||||
project=item.change.project.name,
|
||||
tags=' '.join(sorted(job.tags)))
|
||||
|
||||
if hasattr(item.change, 'branch'):
|
||||
zuul_params['branch'] = item.change.branch
|
||||
if hasattr(item.change, 'number'):
|
||||
|
|
Loading…
Reference in New Issue