zuul
/
zuul
Code Issues Proposed changes

Rename uuid to build 

We're providing more than one uuid to the job, so to make it clear
that one is for the build, and one is for the buildset, use those
words.

Change-Id: If9ebdc783dcef4f8dea9fa491b40ae49416e5cf1
This commit is contained in:
James E. Blair 2017-07-20 16:07:30 -07:00
parent 9d46f09c5e
commit a9fbb6c207
13 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/user/jobs.rst
View File

@ -121,7 +121,7 @@ of item.
All items provide the following information as Ansible variables:
**zuul.uuid**
**zuul.build**
The UUID of the build. A build is a single execution of a job.
When an item is enqueued into a pipeline, this usually results in
one build of each job configured for that item's project. However,
@ -131,8 +131,6 @@ All items provide the following information as Ansible variables:
job is run, for whatever reason, it is acompanied with a new
unique id.
.. TODO: rename build
**zuul.buildset**
The build set UUID. When Zuul runs jobs for an item, the collection
of those jobs is known as a buildset. If the configuration of items

2
tests/fixtures/config/ansible/git/bare-role/tasks/main.yaml vendored
View File

@ -1,3 +1,3 @@
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.bare-role.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.bare-role.flag"
state: touch

2
tests/fixtures/config/ansible/git/common-config/playbooks/post.yaml vendored
View File

@ -1,5 +1,5 @@
- hosts: all
tasks:
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.post.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.post.flag"
state: touch

2
tests/fixtures/config/ansible/git/common-config/playbooks/pre.yaml vendored
View File

@ -1,5 +1,5 @@
- hosts: all
tasks:
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.pre.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.pre.flag"
state: touch

6
tests/fixtures/config/ansible/git/common-config/playbooks/python27.yaml vendored
View File

@ -4,10 +4,10 @@
path: "{{flagpath}}"
state: touch
- copy:
src: "{{zuul._test.test_root}}/{{zuul.uuid}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.uuid}}.copied"
src: "{{zuul._test.test_root}}/{{zuul.build}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.build}}.copied"
- copy:
content: "{{test_secret.username}} {{test_secret.password}}"
dest: "{{zuul._test.test_root}}/{{zuul.uuid}}.secrets"
dest: "{{zuul._test.test_root}}/{{zuul.build}}.secrets"
roles:
- bare-role

2
tests/fixtures/config/ansible/git/common-config/zuul.yaml vendored
View File

@ -59,7 +59,7 @@
pre-run: playbooks/pre
post-run: playbooks/post
vars:
flagpath: '{{zuul._test.test_root}}/{{zuul.uuid}}.flag'
flagpath: '{{zuul._test.test_root}}/{{zuul.build}}.flag'
roles:
- zuul: bare-role
auth:

4
tests/fixtures/config/ansible/git/org_project/playbooks/faillocal.yaml vendored
View File

@ -1,5 +1,5 @@
- hosts: all
tasks:
- copy:
src: "{{zuul._test.test_root}}/{{zuul.uuid}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.uuid}}.failed"
src: "{{zuul._test.test_root}}/{{zuul.build}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.build}}.failed"

2
tests/fixtures/config/pre-playbook/git/common-config/playbooks/post.yaml vendored
View File

@ -1,5 +1,5 @@
- hosts: all
tasks:
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.post.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.post.flag"
state: touch

6
tests/fixtures/config/pre-playbook/git/common-config/playbooks/pre.yaml vendored
View File

@ -1,8 +1,8 @@
- hosts: all
tasks:
- copy:
src: "{{zuul._test.test_root}}/{{zuul.uuid}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.uuid}}.failed"
src: "{{zuul._test.test_root}}/{{zuul.build}}.flag"
dest: "{{zuul._test.test_root}}/{{zuul.build}}.failed"
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.pre.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.pre.flag"
state: touch

2
tests/fixtures/config/pre-playbook/git/common-config/playbooks/python27.yaml vendored
View File

@ -1,5 +1,5 @@
- hosts: all
tasks:
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.main.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.main.flag"
state: touch

2
tests/fixtures/config/roles/git/bare-role/tasks/main.yaml vendored
View File

@ -1,3 +1,3 @@
- file:
path: "{{zuul._test.test_root}}/{{zuul.uuid}}.bare-role.flag"
path: "{{zuul._test.test_root}}/{{zuul.build}}.bare-role.flag"
state: touch

2
tests/fixtures/config/streamer/git/common-config/zuul.yaml vendored
View File

@ -14,4 +14,4 @@
- job:
name: python27
vars:
waitpath: '{{zuul._test.test_root}}/{{zuul.uuid}}/test_wait'
waitpath: '{{zuul._test.test_root}}/{{zuul.build}}/test_wait'

2
zuul/executor/client.py
View File

@ -155,7 +155,7 @@ class ExecutorClient(object):
canonical_hostname=item.change.project.canonical_hostname,
canonical_name=item.change.project.canonical_name)
zuul_params = dict(uuid=uuid,
zuul_params = dict(build=uuid,
buildset=item.current_build_set.uuid,
ref=item.change.ref,
pipeline=pipeline.name,