commit d53e7cf58e803df5e6ff407becc5c4ed34f4d4b7
author Paul Belanger <pabelanger@redhat.com> Thu May 04 14:19:21 2017 -0400
committer Paul Belanger <pabelanger@redhat.com> Thu May 04 14:59:07 2017 -0400
tree 56599610608d92d4b59dec391c6e19d2f281d51c
parent 71e4679be8d9dfa0c665efd2156c859d5e4e7d79

Update zuul.project to dictonary for vars.yaml

With the introduction of canonical names, we needed to update our
zuul.project variable in ansible.

Below is an example format for zuul.project variable:

  - zuul.project.name == 'org/project'
  - zuul.project.canonical_hostname == 'review.example.com'
  - zuul.project.canonical_name == 'review.example.com/org/project'

Change-Id: I194523561fbf18c85ed4e9dad5afde62de5d8e35
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml

diff --git a/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml b/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
index 92c66d1..1f8fdf3 100644
--- a/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
+++ b/tests/fixtures/config/ansible/git/common-config/playbooks/check-vars.yaml
@@ -13,3 +13,10 @@
           - zuul.executor.hostname is defined
           - zuul.executor.src_root is defined
           - zuul.executor.log_root is defined
+
+    - name: Assert zuul.project variables are valid.
+      assert:
+        that:
+          - zuul.project.name == 'org/project'
+          - zuul.project.canonical_hostname == 'review.example.com'
+          - zuul.project.canonical_name == 'review.example.com/org/project'

zuul/executor/client.py

diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index 7e2d296..9f234e9 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -183,10 +183,15 @@
         dependent_items.reverse()
         # TODOv3(jeblair): This ansible vars data structure will
         # replace the environment variables below.
+        project = dict(
+            name=item.change.project.name,
+            canonical_hostname=item.change.project.canonical_hostname,
+            canonical_name=item.change.project.canonical_name)
+
         zuul_params = dict(uuid=uuid,
                            pipeline=pipeline.name,
                            job=job.name,
-                           project=item.change.project.name,
+                           project=project,
                            tags=' '.join(sorted(job.tags)))
 
         if hasattr(item.change, 'branch'):