summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorMartin Krizek <martin.krizek@gmail.com>2023-03-20 17:55:58 +0100
committerGitHub <noreply@github.com>2023-03-20 11:55:58 -0500
commitddbad5842886eaff073182b5504a0b757a00b42d (patch)
treedfdc8cfb462bf3742be86b04113ab9cc2e0c360d /test/integration
parentdcad473afc016283bf12fe4e1636f0266a91513e (diff)
downloadansible-ddbad5842886eaff073182b5504a0b757a00b42d.tar.gz
Use FAs with inheritance only when applicable (#80026) (#80076)
... and set default value of an attribute on an object only in NonInheritableFA. Fixes #79777 ci_complete (cherry picked from commit 6c3d2a4e51df560e350d1ca3d6a039bf0e05f2ab)
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/targets/keyword_inheritance/dep_keyword_inheritance.yml8
-rw-r--r--test/integration/targets/keyword_inheritance/roles/role-meta-inheritance/meta/main.yml4
-rwxr-xr-xtest/integration/targets/keyword_inheritance/runme.sh2
3 files changed, 14 insertions, 0 deletions
diff --git a/test/integration/targets/keyword_inheritance/dep_keyword_inheritance.yml b/test/integration/targets/keyword_inheritance/dep_keyword_inheritance.yml
new file mode 100644
index 0000000000..3d3b684ab4
--- /dev/null
+++ b/test/integration/targets/keyword_inheritance/dep_keyword_inheritance.yml
@@ -0,0 +1,8 @@
+- hosts: localhost
+ gather_facts: false
+ tasks:
+ - include_role:
+ name: "{{ item }}"
+ loop:
+ - setup_test_user
+ - role-meta-inheritance
diff --git a/test/integration/targets/keyword_inheritance/roles/role-meta-inheritance/meta/main.yml b/test/integration/targets/keyword_inheritance/roles/role-meta-inheritance/meta/main.yml
new file mode 100644
index 0000000000..b0af49fb14
--- /dev/null
+++ b/test/integration/targets/keyword_inheritance/roles/role-meta-inheritance/meta/main.yml
@@ -0,0 +1,4 @@
+dependencies:
+ - role: whoami
+ become: true
+ become_user: ansibletest0
diff --git a/test/integration/targets/keyword_inheritance/runme.sh b/test/integration/targets/keyword_inheritance/runme.sh
index 6b78a06dc4..1f13ef85c7 100755
--- a/test/integration/targets/keyword_inheritance/runme.sh
+++ b/test/integration/targets/keyword_inheritance/runme.sh
@@ -3,3 +3,5 @@
set -eux
ANSIBLE_ROLES_PATH=../ ansible-playbook -i ../../inventory test.yml "$@"
+
+ANSIBLE_ROLES_PATH=../ ansible-playbook -i ../../inventory dep_keyword_inheritance.yml "$@"