diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-08 21:30:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-08 21:30:00 +0000 |
| commit | 3d60914a0e2cbc6017abce7caa9a16cc1e49bcc3 (patch) | |
| tree | ffed75fe4ad6109c2e0b418d9ba9e9bd152c95b7 /tests/fixtures | |
| parent | 47227b743f0daeac5a870ab10a29ace8ecfedaf3 (diff) | |
| parent | 7949efd255e76dd63412a13edac3927bf2939b84 (diff) | |
| download | zuul-3d60914a0e2cbc6017abce7caa9a16cc1e49bcc3.tar.gz | |
Merge "Add Ansible 6"
Diffstat (limited to 'tests/fixtures')
8 files changed, 49 insertions, 2 deletions
diff --git a/tests/fixtures/config/ansible-callbacks/main6.yaml b/tests/fixtures/config/ansible-callbacks/main6.yaml new file mode 100644 index 000000000..2467362bb --- /dev/null +++ b/tests/fixtures/config/ansible-callbacks/main6.yaml @@ -0,0 +1,7 @@ +- tenant: + name: tenant-one + default-ansible-version: '6' + source: + gerrit: + config-projects: + - common-config diff --git a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml index 3a34a1d86..e1bac5e01 100644 --- a/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml +++ b/tests/fixtures/config/ansible-versions/git/common-config/zuul.yaml @@ -60,6 +60,14 @@ test_ansible_version_major: 2 test_ansible_version_minor: 12 +- job: + name: ansible-6 + parent: ansible-version + ansible-version: 6 + vars: + test_ansible_version_major: 2 + test_ansible_version_minor: 13 + - project: name: common-config check: @@ -68,6 +76,7 @@ - ansible-28 - ansible-29 - ansible-5 + - ansible-6 - project: name: org/project @@ -77,3 +86,4 @@ - ansible-28 - ansible-29 - ansible-5 + - ansible-6 diff --git a/tests/fixtures/config/ansible/main6.yaml b/tests/fixtures/config/ansible/main6.yaml new file mode 100644 index 000000000..7db6af6da --- /dev/null +++ b/tests/fixtures/config/ansible/main6.yaml @@ -0,0 +1,11 @@ +- tenant: + name: tenant-one + default-ansible-version: '6' + source: + gerrit: + config-projects: + - common-config + untrusted-projects: + - org/project + - bare-role + - org/ansible diff --git a/tests/fixtures/config/executor-facts/main6.yaml b/tests/fixtures/config/executor-facts/main6.yaml new file mode 100644 index 000000000..792f13402 --- /dev/null +++ b/tests/fixtures/config/executor-facts/main6.yaml @@ -0,0 +1,9 @@ +- tenant: + name: tenant-one + default-ansible-version: '6' + source: + gerrit: + config-projects: + - common-config + untrusted-projects: + - org/project diff --git a/tests/fixtures/config/inventory/git/common-config/zuul.yaml b/tests/fixtures/config/inventory/git/common-config/zuul.yaml index 6b5fe67d0..ca687139d 100644 --- a/tests/fixtures/config/inventory/git/common-config/zuul.yaml +++ b/tests/fixtures/config/inventory/git/common-config/zuul.yaml @@ -140,3 +140,12 @@ label: ubuntu-xenial ansible-version: '5' run: playbooks/ansible-version.yaml + +- job: + name: ansible-version6-inventory + nodeset: + nodes: + - name: ubuntu-xenial + label: ubuntu-xenial + ansible-version: '6' + run: playbooks/ansible-version.yaml diff --git a/tests/fixtures/config/inventory/git/org_project/.zuul.yaml b/tests/fixtures/config/inventory/git/org_project/.zuul.yaml index 1028a0ff2..69ec3127e 100644 --- a/tests/fixtures/config/inventory/git/org_project/.zuul.yaml +++ b/tests/fixtures/config/inventory/git/org_project/.zuul.yaml @@ -10,3 +10,4 @@ - ansible-version28-inventory - ansible-version29-inventory - ansible-version5-inventory + - ansible-version6-inventory diff --git a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_exception.py b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_exception.py index 6cfa0a3d0..7933f15a8 100755 --- a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_exception.py +++ b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_exception.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 def main(): diff --git a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_no_result.py b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_no_result.py index 065509d0d..0bdced5eb 100755 --- a/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_no_result.py +++ b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/library/broken_module_no_result.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 def main(): |