From a453ac31f3428614cceb99027f8efbdb9258a40b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 14 May 2024 22:03:01 +0200
Subject: Adding upstream version 2.10.7+merged+base+2.10.8+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 test/integration/targets/inventory_yaml/aliases    |  2 +
 test/integration/targets/inventory_yaml/empty.json | 10 ++++
 test/integration/targets/inventory_yaml/runme.sh   |  4 ++
 .../targets/inventory_yaml/success.json            | 61 ++++++++++++++++++++++
 test/integration/targets/inventory_yaml/test.yml   | 27 ++++++++++
 5 files changed, 104 insertions(+)
 create mode 100644 test/integration/targets/inventory_yaml/aliases
 create mode 100644 test/integration/targets/inventory_yaml/empty.json
 create mode 100755 test/integration/targets/inventory_yaml/runme.sh
 create mode 100644 test/integration/targets/inventory_yaml/success.json
 create mode 100644 test/integration/targets/inventory_yaml/test.yml

(limited to 'test/integration/targets/inventory_yaml')

diff --git a/test/integration/targets/inventory_yaml/aliases b/test/integration/targets/inventory_yaml/aliases
new file mode 100644
index 00000000..f8e28c7e
--- /dev/null
+++ b/test/integration/targets/inventory_yaml/aliases
@@ -0,0 +1,2 @@
+shippable/posix/group1
+skip/aix
diff --git a/test/integration/targets/inventory_yaml/empty.json b/test/integration/targets/inventory_yaml/empty.json
new file mode 100644
index 00000000..e1ae0684
--- /dev/null
+++ b/test/integration/targets/inventory_yaml/empty.json
@@ -0,0 +1,10 @@
+{
+    "_meta": {
+        "hostvars": {}
+    }, 
+    "all": {
+        "children": [
+            "ungrouped"
+        ]
+    }
+}
diff --git a/test/integration/targets/inventory_yaml/runme.sh b/test/integration/targets/inventory_yaml/runme.sh
new file mode 100755
index 00000000..b82f499d
--- /dev/null
+++ b/test/integration/targets/inventory_yaml/runme.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# handle empty/commented out group keys correctly https://github.com/ansible/ansible/issues/47254
+ANSIBLE_VERBOSITY=0 diff -w <(ansible-inventory -i ./test.yml --list) success.json
diff --git a/test/integration/targets/inventory_yaml/success.json b/test/integration/targets/inventory_yaml/success.json
new file mode 100644
index 00000000..a8b15f96
--- /dev/null
+++ b/test/integration/targets/inventory_yaml/success.json
@@ -0,0 +1,61 @@
+{
+    "_meta": {
+        "hostvars": {
+            "alice": {
+                "status": "single"
+            }, 
+            "bobby": {
+                "in_trouble": true, 
+                "popular": false
+            }, 
+            "cindy": {
+                "in_trouble": true, 
+                "popular": true
+            }, 
+            "greg": {
+                "in_trouble": true, 
+                "popular": true
+            }, 
+            "jan": {
+                "in_trouble": true, 
+                "popular": false
+            }, 
+            "marcia": {
+                "in_trouble": true, 
+                "popular": true
+            }, 
+            "peter": {
+                "in_trouble": true, 
+                "popular": false
+            }
+        }
+    }, 
+    "all": {
+        "children": [
+            "cousins", 
+            "kids", 
+            "the-maid", 
+            "ungrouped"
+        ]
+    }, 
+    "cousins": {
+        "children": [
+            "redheads"
+        ]
+    }, 
+    "kids": {
+        "hosts": [
+            "bobby", 
+            "cindy", 
+            "greg", 
+            "jan", 
+            "marcia", 
+            "peter"
+        ]
+    }, 
+    "the-maid": {
+        "hosts": [
+            "alice"
+        ]
+    }
+}
diff --git a/test/integration/targets/inventory_yaml/test.yml b/test/integration/targets/inventory_yaml/test.yml
new file mode 100644
index 00000000..9755396a
--- /dev/null
+++ b/test/integration/targets/inventory_yaml/test.yml
@@ -0,0 +1,27 @@
+all:
+    children:
+        kids:
+            hosts:
+                marcia:
+                    popular: True
+                jan:
+                    popular: False
+                cindy:
+                    popular: True
+                greg:
+                    popular: True
+                peter:
+                    popular: False
+                bobby:
+                    popular: False
+            vars:
+                in_trouble: True
+        cousins:
+            children:
+                redheads:
+                    hosts:
+                        #oliver:  # this used to cause an error and deliver incomplete inventory
+        the-maid:
+            hosts:
+                alice:
+                    status: single
-- 
cgit v1.2.3