diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-25 23:43:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-25 23:43:41 +0000 |
| commit | 0877458d289a307f6cf53aff7d9fb2e9fe94161c (patch) | |
| tree | 8d6f9631338c8bba14ec67c2909a9d5829f8d46f /tests/fixtures | |
| parent | 7f6287cbfebe53082c3bb59ab07fb547ebc2b3a6 (diff) | |
| parent | 096e47dc436b73f8876a1afec8874e13269a4abd (diff) | |
| download | zuul-0877458d289a307f6cf53aff7d9fb2e9fe94161c.tar.gz | |
Merge "Fix console log streaming with duplicated roles"
Diffstat (limited to 'tests/fixtures')
3 files changed, 24 insertions, 0 deletions
diff --git a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml index d6a53be74..8d5667f10 100644 --- a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml +++ b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml @@ -89,3 +89,22 @@ - failed_in_loop1 - failed_in_loop2 ignore_errors: True + +# Try transitive includes two different ways +- hosts: compute1 + tasks: + - include_role: + name: include-echo-role + vars: + item: transitive-one + - include_role: + name: include-echo-role + vars: + item: transitive-two + +- hosts: compute1 + roles: + - role: include-echo-role + item: transitive-three + - role: include-echo-role + item: transitive-four diff --git a/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/echo-role/tasks/main.yaml b/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/echo-role/tasks/main.yaml new file mode 100644 index 000000000..500329797 --- /dev/null +++ b/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/echo-role/tasks/main.yaml @@ -0,0 +1,2 @@ +- name: Echo message + command: "echo {{item}}" diff --git a/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/include-echo-role/tasks/main.yaml b/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/include-echo-role/tasks/main.yaml new file mode 100644 index 000000000..79eade799 --- /dev/null +++ b/tests/fixtures/config/remote-zuul-stream/git/org_project/roles/include-echo-role/tasks/main.yaml @@ -0,0 +1,3 @@ +- name: Include echo role + include_role: + name: echo-role |