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_db/tasks/multi_db_create_delete.yml

@@ -33,9 +33,9 @@
 - name: assert that databases does not exist
   assert:
     that:
-      - "'{{ db1_name }}' not in mysql_result.stdout"
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' not in mysql_result.stdout"
+      - db1_name not in mysql_result.stdout
+      - db2_name not in mysql_result.stdout
+      - db3_name not in mysql_result.stdout
 
 # ==========================================================================
 # Create multiple databases that does not exists (check mode)
@@ -65,9 +65,9 @@
 - name: assert that databases does not exist (since created via check mode)
   assert:
     that:
-      - "'{{ db1_name }}' not in mysql_result.stdout"
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' not in mysql_result.stdout"
+      - db1_name not in mysql_result.stdout
+      - db2_name not in mysql_result.stdout
+      - db3_name not in mysql_result.stdout
 
 # ==========================================================================
 # Create multiple databases
@@ -88,7 +88,7 @@
   assert:
     that:
       - result is changed
-      - result.db_list == ['{{ db1_name }}', '{{ db2_name }}', '{{ db3_name }}']
+      - result.db_list == [db1_name, db2_name, db3_name]
 
 - name: run command to list databases like specified database name
   command: "{{ mysql_command }} \"-e show databases like 'database%'\""
@@ -97,9 +97,9 @@
 - name: assert that databases exist after creation
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # =========================================================================
 # Recreate already existing databases (check mode)
@@ -129,9 +129,9 @@
 - name: assert that databases exist (since performed recreation of existing databases via check mode)
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # ==========================================================================
 # Recreate same databases
@@ -160,9 +160,9 @@
 - name: assert that databases does priorly exist
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # ==========================================================================
 # Delete one of the databases (db2 here)
@@ -189,9 +189,9 @@
 - name: assert that only db2 database does not exist
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name not in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # =========================================================================
 # Recreate multiple databases in which few databases does not exists (check mode)
@@ -221,9 +221,9 @@
 - name: assert that recreated non existing databases does not exist (since created via check mode)
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name not in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # ==========================================================================
 # Create multiple databases
@@ -252,9 +252,9 @@
 - name: assert that databases exist
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # ============================== DUMP TEST =================================
 #
@@ -293,9 +293,9 @@
 - name: assert that databases exist (check mode)
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 - name: state dump - file name should not exist (since dumped via check mode)
   file:
@@ -332,10 +332,10 @@
 - name: assert that databases exist (since check mode)
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
 
 - name: state dump - file name should not exist (since prior dump operation performed via check mode)
   file:
@@ -371,11 +371,11 @@
 - name: assert that databases exist (since delete via check mode)
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
-      - "'{{ db5_name }}' not in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
+      - db5_name not in mysql_result.stdout
 
 - name: state dump - file name should not exist (since prior dump operation performed via check mode)
   file:
@@ -403,7 +403,7 @@
   assert:
     that:
       - dump_result is changed
-      - dump_result.db_list == ['{{ db1_name }}', '{{ db2_name }}', '{{ db3_name }}']
+      - dump_result.db_list == [db1_name, db2_name, db3_name]
 
 - name: Run command to list databases like specified database name
   command: "{{ mysql_command }} \"-e show databases like 'database%'\""
@@ -412,9 +412,9 @@
 - name: assert that databases exist
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 - name: State dump - file name should exist (dump1_file)
   file:
@@ -461,11 +461,11 @@
 - name: assert that databases exist
   assert:
     that:
-      - "'{{ db1_name }}' in mysql_result.stdout"
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
-      - "'{{ db5_name }}' not in mysql_result.stdout"
+      - db1_name in mysql_result.stdout
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
+      - db5_name not in mysql_result.stdout
 
 - name: state dump - file name should exist (dump2_file)
   file:
@@ -501,8 +501,8 @@
 - name: assert that databases exist even after deleting (since deleted via check mode)
   assert:
     that:
-      - "'{{ db2_name }}' in mysql_result.stdout"
-      - "'{{ db3_name }}' in mysql_result.stdout"
+      - db2_name in mysql_result.stdout
+      - db3_name in mysql_result.stdout
 
 # ==========================================================================
 # Delete multiple databases
@@ -522,7 +522,7 @@
   assert:
     that:
       - result is changed
-      - result.db_list == ['{{ db2_name }}', '{{ db3_name }}']
+      - result.db_list == [db2_name, db3_name]
 
 - name: run command to list databases like specified database name
   command: "{{ mysql_command }} \"-e show databases like 'database%'\""
@@ -531,8 +531,8 @@
 - name: assert that databases does not exist
   assert:
     that:
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' not in mysql_result.stdout"
+      - db2_name not in mysql_result.stdout
+      - db3_name not in mysql_result.stdout
 
 # ==========================================================================
 # Delete non existing databases (check mode)
@@ -561,8 +561,8 @@
 - name: assert that databases does not exist since were deleted priorly (check mode)
   assert:
     that:
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
+      - db2_name not in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
 
 # ==========================================================================
 # Delete already deleted databases
@@ -590,8 +590,8 @@
 - name: assert that databases does not exists
   assert:
     that:
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
+      - db2_name not in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
 
 # ==========================================================================
 # Delete all databases
@@ -622,11 +622,11 @@
 - name: assert that specific databases does not exist
   assert:
     that:
-      - "'{{ db1_name }}' not in mysql_result.stdout"
-      - "'{{ db2_name }}' not in mysql_result.stdout"
-      - "'{{ db3_name }}' not in mysql_result.stdout"
-      - "'{{ db4_name }}' not in mysql_result.stdout"
-      - "'{{ db5_name }}' not in mysql_result.stdout"
+      - db1_name not in mysql_result.stdout
+      - db2_name not in mysql_result.stdout
+      - db3_name not in mysql_result.stdout
+      - db4_name not in mysql_result.stdout
+      - db5_name not in mysql_result.stdout
 
 - name: state dump - dump 1 file name should be removed
   file:

tests/integration/targets/test_mysql_db/tasks/state_dump_import.yml

@@ -283,7 +283,7 @@
 - name: Dump and Import | Assert that db_name2 database does not exist
   assert:
     that:
-      - "'{{ db_name2 }}' not in mysql_result.stdout"
+      - db_name2 not in mysql_result.stdout
 
 - name: Dump and Import | Test state=import to restore a database from dumped file2 (check mode)
   mysql_db:
@@ -309,7 +309,7 @@
 - name: Dump and Import | Assert that db_name2 database does not exist (check mode)
   assert:
     that:
-      - "'{{ db_name2 }}' not in mysql_result.stdout"
+      - db_name2 not in mysql_result.stdout
 
 - name: Dump and Import | Test state=import to restore a database from multiple database dumped file2
   mysql_db:
@@ -326,7 +326,7 @@
   assert:
     that:
       - import_result2 is changed
-      - import_result2.db_list == ['{{ db_name2 }}']
+      - import_result2.db_list == [db_name2]
 
 - name: Dump and Import | Run command to list databases
   command: "{{ mysql_command }} \"-e show databases like 'data%'\""
@@ -335,7 +335,7 @@
 - name: Dump and Import | Assert that db_name2 database does exist after import
   assert:
     that:
-      - "'{{ db_name2 }}' in mysql_result.stdout"
+      - db_name2 in mysql_result.stdout
 
 - name: Dump and Import | Test state=dump to backup the database of type {{ format_type }} (expect changed=true)
   mysql_db:
@@ -487,18 +487,22 @@
     login_password: '{{ mysql_password }}'
     login_host: '{{ mysql_host }}'
     login_port: '{{ mysql_primary_port }}'
-    name: '{{ item }}'
+    name: '{{ cleanup_db }}'
     state: absent
   loop:
     - '{{ db_name }}'
     - '{{ db_name2 }}'
+  loop_control:
+    loop_var: cleanup_db
 
 - name: Dump and Import | Clean up files
   file:
-    name: '{{ item }}'
+    name: '{{ cleanup_file }}'
     state: absent
   loop:
     - '{{ db_file_name }}'
     - '{{ wrong_sql_file }}'
     - '{{ dump_file1 }}'
     - '{{ dump_file2 }}'
+  loop_control:
+    loop_var: cleanup_file

tests/integration/targets/test_mysql_db/tasks/state_present_absent.yml

@@ -41,8 +41,10 @@
   assert:
     that:
       - result is changed
-      - result.db == '{{ db_name }}'
-      - result.executed_commands == ["CREATE DATABASE `{{ db_name }}`"]
+      - result.db == db_name
+      - result.executed_commands == expected_commands
+  vars:
+    expected_commands: ["CREATE DATABASE `{{ db_name }}`"]
 
 - name: State Present Absent | Run command to test state=present for a database name (expect db_name in stdout)
   command: "{{ mysql_command }} -e \"show databases like '{{ db_name | regex_replace(\"([%_\\\\])\", \"\\\\\\1\") }}'\""
@@ -51,7 +53,7 @@
 - name: State Present Absent | Assert database exist
   assert:
     that:
-      - "'{{ db_name }}' in result.stdout"
+      - db_name in result.stdout
 
 # ============================================================
 - name: State Present Absent | Test state=absent for a database name (expect changed=true)
@@ -68,8 +70,10 @@
   assert:
     that:
       - result is changed
-      - result.db == '{{ db_name }}'
-      - result.executed_commands == ["DROP DATABASE `{{ db_name }}`"]
+      - result.db == db_name
+      - result.executed_commands == expected_commands
+  vars:
+    expected_commands: ["DROP DATABASE `{{ db_name }}`"]
 
 - name: State Present Absent | Run command to test state=absent for a database name (expect db_name not in stdout)
   command: "{{ mysql_command }} -e \"show databases like '{{ db_name | regex_replace(\"([%_\\\\])\", \"\\\\\\1\") }}'\""
@@ -78,7 +82,7 @@
 - name: State Present Absent | Assert database does not exist
   assert:
     that:
-      - "'{{ db_name }}' not in result.stdout"
+      - db_name not in result.stdout
 
 # ============================================================
 - name: State Present Absent | Test mysql_db encoding param not valid - issue 8075
@@ -116,7 +120,9 @@
   assert:
     that:
       - result is changed
-      - result.executed_commands == ["CREATE DATABASE `en{{ db_name }}` CHARACTER SET 'utf8'"]
+      - result.executed_commands == expected_commands
+  vars:
+    expected_commands: ["CREATE DATABASE `en{{ db_name }}` CHARACTER SET 'utf8'"]
 
 - name: State Present Absent | Test database was created
   command: "{{ mysql_command }} -e \"SHOW CREATE DATABASE `en{{ db_name }}`\""
@@ -152,7 +158,9 @@
   assert:
     that:
       - result is changed
-      - result.executed_commands == ["CREATE DATABASE `en{{ db_name }}` CHARACTER SET 'binary'"]
+      - result.executed_commands == expected_commands
+  vars:
+    expected_commands: ["CREATE DATABASE `en{{ db_name }}` CHARACTER SET 'binary'"]
 
 - name: State Present Absent | Run command to test database was created
   command: "{{ mysql_command }} -e \"SHOW CREATE DATABASE `en{{ db_name }}`\""
@@ -207,7 +215,7 @@
 - name: State Present Absent | Assert database exist
   assert:
     that:
-      - "'{{ db_user1 }}' in result.stdout"
+      - db_user1 in result.stdout
 
 # ============================================================
 - name: State Present Absent | Create user2 to access database with privilege select only
@@ -245,7 +253,7 @@
 - name: State Present Absent | Assert database does not exist
   assert:
     that:
-      - "'{{ db_user2 }}' not in result.stdout"
+      - db_user2 not in result.stdout
 
 # ============================================================
 - name: State Present Absent | Delete database using user2 with no privilege to delete (expect failed=true)
@@ -272,7 +280,7 @@
 - name: State Present Absent | Assert database still exist
   assert:
     that:
-      - "'{{ db_user1 }}' in result.stdout"
+      - db_user1 in result.stdout
 
 # ============================================================
 - name: State Present Absent | Delete database using user1 with all privilege to delete a database (expect changed=true)
@@ -290,7 +298,9 @@
   assert:
     that:
       - result is changed
-      - result.executed_commands == ["DROP DATABASE `{{ db_user1 }}`"]
+      - result.executed_commands == expected_commands
+  vars:
+    expected_commands: ["DROP DATABASE `{{ db_user1 }}`"]
 
 - name: State Present Absent | Run command to test database was deleted using user1
   command: "{{ mysql_command }} -e \"show databases like '{{ db_name | regex_replace(\"([%_\\\\])\", \"\\\\\\1\") }}'\""
@@ -299,4 +309,4 @@
 - name: State Present Absent | Assert database does not exist
   assert:
     that:
-      - "'{{ db_user1 }}' not in result.stdout"
+      - db_user1 not in result.stdout