diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-29 17:38:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-29 17:38:51 +0000 |
| commit | 3c16f184078255e4e0d724073c5a31a368f47ed4 (patch) | |
| tree | a88f2847f97c9dd781cf049aa1f7b1f3ce0b465e /tests/fixtures | |
| parent | e36d1a310f0262233f3d7be7504654c5b321cb11 (diff) | |
| parent | d4006d6927032bbdc1fbcdb26c4a977aed0e7f7f (diff) | |
| download | zuul-3c16f184078255e4e0d724073c5a31a368f47ed4.tar.gz | |
Merge "Use username from node information if available" into feature/zuulv3
Diffstat (limited to 'tests/fixtures')
3 files changed, 16 insertions, 0 deletions
diff --git a/tests/fixtures/config/inventory/git/common-config/playbooks/hostvars-inventory.yaml b/tests/fixtures/config/inventory/git/common-config/playbooks/hostvars-inventory.yaml new file mode 100644 index 000000000..f679dceae --- /dev/null +++ b/tests/fixtures/config/inventory/git/common-config/playbooks/hostvars-inventory.yaml @@ -0,0 +1,2 @@ +- hosts: all + tasks: [] diff --git a/tests/fixtures/config/inventory/git/common-config/zuul.yaml b/tests/fixtures/config/inventory/git/common-config/zuul.yaml index 900abd669..74ddf2dce 100644 --- a/tests/fixtures/config/inventory/git/common-config/zuul.yaml +++ b/tests/fixtures/config/inventory/git/common-config/zuul.yaml @@ -31,6 +31,14 @@ - compute1 - compute2 +- nodeset: + name: nodeset2 + nodes: + - name: default + label: default-label + - name: fakeuser + label: fakeuser-label + - job: name: base parent: null @@ -47,3 +55,8 @@ name: group-inventory nodeset: nodeset1 run: playbooks/group-inventory.yaml + +- job: + name: hostvars-inventory + run: playbooks/hostvars-inventory.yaml + nodeset: nodeset2 diff --git a/tests/fixtures/config/inventory/git/org_project/.zuul.yaml b/tests/fixtures/config/inventory/git/org_project/.zuul.yaml index 26310a0b5..1a8bf5d64 100644 --- a/tests/fixtures/config/inventory/git/org_project/.zuul.yaml +++ b/tests/fixtures/config/inventory/git/org_project/.zuul.yaml @@ -4,3 +4,4 @@ jobs: - single-inventory - group-inventory + - hostvars-inventory |