Merge "Rename tags job variable jobtags" into feature/zuulv3
diff --git a/doc/source/user/jobs.rst b/doc/source/user/jobs.rst
index db13460..beb489e 100644
--- a/doc/source/user/jobs.rst
+++ b/doc/source/user/jobs.rst
@@ -167,13 +167,11 @@
**zuul.tenant**
The name of the current Zuul tenant.
-**zuul.tags**
+**zuul.jobtags**
A list of tags associated with the job. Not to be confused with git
tags, these are simply free-form text fields that can be used by the
job for reporting or classification purposes.
-.. TODO: rename jobtags
-
**zuul.items**
A data structure representing the items being tested with this
change.
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 5faf563..d4290a9 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2791,13 +2791,13 @@
self.assertEqual(len(self.history), 2)
results = {self.getJobFromHistory('merge',
- project='org/project1').uuid: 'extratag merge',
+ project='org/project1').uuid: ['extratag', 'merge'],
self.getJobFromHistory('merge',
- project='org/project2').uuid: 'merge'}
+ project='org/project2').uuid: ['merge']}
for build in self.history:
self.assertEqual(results.get(build.uuid, ''),
- build.parameters['zuul'].get('tags'))
+ build.parameters['zuul'].get('jobtags'))
def test_timer(self):
"Test that a periodic job is triggered"
diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index dccb8d2..25bc0cf 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -162,7 +162,7 @@
job=job.name,
project=project,
tenant=tenant.name,
- tags=' '.join(sorted(job.tags)))
+ jobtags=sorted(job.tags))
if hasattr(item.change, 'branch'):
zuul_params['branch'] = item.change.branch
if hasattr(item.change, 'tag'):