CI: fix string templating for ansible devel (core 2.19, 12 beta) in tests (#713)

* fix string templating for ansible devel (core 2.19, 12 beta)

* fix order to prevent [ERROR]: Task failed: Module failed: 'Server_id'

* cut jinja templates from conditionals

* fix 'item' already in use

tests/integration/targets/test_mysql_variables/tasks/assert_var.yml

@@ -23,7 +23,7 @@
 - name: Assert output message changed value
   assert:
     that:
-      - "output.changed | bool == changed | bool"
+      - output.changed | bool == changed | bool
 
 - name: Run mysql command to show variable
   command: "{{ mysql_command }} \"-e show variables like '{{ var_name }}'\""
@@ -33,5 +33,5 @@
   assert:
     that:
       - result is changed
-      - "'{{ var_name }}' in result.stdout"
-      - "'{{ var_value }}' in result.stdout"
+      - var_name | string in result.stdout
+      - var_value | string in result.stdout

tests/integration/targets/test_mysql_variables/tasks/assert_var_output.yml

@@ -22,7 +22,7 @@
 - name: assert output message changed value
   assert:
     that:
-      - "output.changed | bool == changed | bool"
+      - output.changed | bool == changed | bool
 
 - set_fact:
     key_name: "{{ var_name }}"
@@ -36,5 +36,5 @@
   assert:
     that:
       - result is changed
-      - "key_name in result.stdout"
-      - "key_value in result.stdout"
+      - key_name in result.stdout
+      - key_value in result.stdout

tests/integration/targets/test_mysql_variables/tasks/mysql_variables.yml

@@ -92,7 +92,9 @@
 
     - assert:
         that:
-        - result.queries == ["SET GLOBAL `{{ set_name }}` = {{ set_value }}"]
+        - result.queries == expected_queries
+      vars:
+        expected_queries: ["SET GLOBAL `{{ set_name }}` = {{ set_value }}"]
 
     - include_tasks: assert_var.yml
       vars:
@@ -291,9 +293,9 @@
     # Bugfix https://github.com/ansible-collections/community.mysql/issues/652
 
     - name: Get server version
-      register: result
       mysql_info:
         <<: *mysql_params
+      register: result
 
     - name: Set variable name when running on MySQL
       set_fact:
@@ -316,7 +318,9 @@
       assert:
         that:
         - result is changed or result.msg == "Variable is already set to requested value."
-        - result.msg == "Variable is already set to requested value." or result.queries == ["SET GLOBAL `{{ log_slow_statements }}` = ON"]
+        - result.msg == "Variable is already set to requested value." or result.queries == expected_queries
+      vars:
+        expected_queries: ["SET GLOBAL `{{ log_slow_statements }}` = ON"]
 
     - name: Set a boolean value again using ON
       mysql_variables:
@@ -378,7 +382,9 @@
       assert:
         that:
         - result is changed
-        - result.queries == ["SET GLOBAL `{{ log_slow_statements }}` = ON"]
+        - result.queries == expected_queries
+      vars:
+        expected_queries: ["SET GLOBAL `{{ log_slow_statements }}` = ON"]
 
     #============================================================
     # Verify mysql_variable fails with an incorrect login_password parameter
@@ -452,7 +458,9 @@
 
         - assert:
             that:
-            - result.queries == ["SET PERSIST `{{ set_name }}` = {{ set_value }}"]
+            - result.queries == expected_queries
+          vars:
+            expected_queries: ["SET PERSIST `{{ set_name }}` = {{ set_value }}"]
 
         - include_tasks: assert_var.yml
           vars:
@@ -494,7 +502,9 @@
         - assert:
             that:
             - result is changed
-            - result.queries == ["SET PERSIST_ONLY `{{ set_name }}` = {{ set_value }}"]
+            - result.queries == expected_queries
+          vars:
+            expected_queries: ["SET PERSIST_ONLY `{{ set_name }}` = {{ set_value }}"]
 
         - name: try to update mysql variable value (expect changed=false) in persist_only mode again
           mysql_variables: