Update order schema to work with jinja template (#4121)

ansible · Apr 23, 2024 · aa1d8bc · aa1d8bc
1 parent d5bb93a
commit aa1d8bc
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/src/ansiblelint/schemas/ansible.json b/src/ansiblelint/schemas/ansible.json
@@ -545,15 +545,22 @@
           "$ref": "#/$defs/templated-boolean"
         },
         "order": {
-          "enum": [
-            "default",
-            "sorted",
-            "reverse_sorted",
-            "reverse_inventory",
-            "shuffle"
+          "oneOf": [
+            {
+              "enum": [
+                "default",
+                "sorted",
+                "reverse_sorted",
+                "reverse_inventory",
+                "shuffle"
+              ],
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/full-jinja"
+            }
           ],
-          "title": "Order",
-          "type": "string"
+          "title": "Order"
         },
         "port": {
           "$ref": "#/$defs/templated-integer",

diff --git a/src/ansiblelint/schemas/playbook.json b/src/ansiblelint/schemas/playbook.json
@@ -555,15 +555,22 @@
           "$ref": "#/$defs/templated-boolean"
         },
         "order": {
-          "enum": [
-            "default",
-            "sorted",
-            "reverse_sorted",
-            "reverse_inventory",
-            "shuffle"
+          "oneOf": [
+            {
+              "enum": [
+                "default",
+                "sorted",
+                "reverse_sorted",
+                "reverse_inventory",
+                "shuffle"
+              ],
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/full-jinja"
+            }
           ],
-          "title": "Order",
-          "type": "string"
+          "title": "Order"
         },
         "port": {
           "$ref": "#/$defs/templated-integer",

diff --git a/test/schemas/test/playbooks/order.yml b/test/schemas/test/playbooks/order.yml
@@ -0,0 +1,10 @@
+---
+- name: Test
+  hosts: all
+  order: "{{ host_order | default('shuffle') }}"
+  gather_facts: false
+  serial: 1
+  tasks:
+    - name: ABC
+      ansible.builtin.debug:
+        msg: "hello"