Add job tags
This allows us to add arbitrary string 'tags' to jobs. These may
then be inspected inside of parameter functions for any purpose.
In OpenStack, we will likely pass these through untouched to the
the build so that they can be picked up by the logstash worker
and we can record extra metadata about jobs.
Change-Id: Ibc00c6d30cdfe4678864adb13421a4d9f71f5128
diff --git a/tests/base.py b/tests/base.py
index f3bfa4e..405caa0 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -620,6 +620,7 @@
BuildHistory(name=self.name, number=self.number,
result=result, changes=changes, node=self.node,
uuid=self.unique, description=self.description,
+ parameters=self.parameters,
pipeline=self.parameters['ZUUL_PIPELINE'])
)
diff --git a/tests/fixtures/layout-tags.yaml b/tests/fixtures/layout-tags.yaml
new file mode 100644
index 0000000..d5b8bf9
--- /dev/null
+++ b/tests/fixtures/layout-tags.yaml
@@ -0,0 +1,42 @@
+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
diff --git a/tests/fixtures/layout.yaml b/tests/fixtures/layout.yaml
index e8f035e..2e48ff1 100644
--- a/tests/fixtures/layout.yaml
+++ b/tests/fixtures/layout.yaml
@@ -107,6 +107,7 @@
- name: ^.*-merge$
failure-message: Unable to merge change
hold-following-changes: true
+ tags: merge
- name: nonvoting-project-test2
voting: false
- name: project-testfile
@@ -120,6 +121,10 @@
mutex: test-mutex
- name: mutex-two
mutex: test-mutex
+ - name: project1-merge
+ tags:
+ - project1
+ - extratag
project-templates:
- name: test-one-and-two
diff --git a/tests/fixtures/tags_custom_functions.py b/tests/fixtures/tags_custom_functions.py
new file mode 100644
index 0000000..67e7ef1
--- /dev/null
+++ b/tests/fixtures/tags_custom_functions.py
@@ -0,0 +1,2 @@
+def apply_tags(item, job, params):
+ params['BUILD_TAGS'] = ' '.join(sorted(job.tags))
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 8960e3a..744a7f9 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -2747,6 +2747,25 @@
self.assertEqual(B.data['status'], 'MERGED')
self.assertEqual(B.reported, 2)
+ def test_tags(self):
+ "Test job tags"
+ self.config.set('zuul', 'layout_config',
+ 'tests/fixtures/layout-tags.yaml')
+ 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()
+
+ results = {'project1-merge': 'extratag merge project1',
+ 'project2-merge': 'merge'}
+
+ for build in self.history:
+ self.assertEqual(results.get(build.name, ''),
+ build.parameters.get('BUILD_TAGS'))
+
def test_timer(self):
"Test that a periodic job is triggered"
self.worker.hold_jobs_in_build = True