Apply feedback

* Expect container to be removed when stopped
* Do not remove container image
* Rename task file to remove_candlepin_container.yml
* Use argv with command module

Author: spetrosi

tests/tasks/cleanup_candlepin_container.yml

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+---
+- name: Check if the candlepin container exists
+  command:
+    argv:
+      - podman
+      - ps
+      - -a
+      - --filter
+      - name=candlepin
+  register: __rhc_candlepin_cont_exists
+  changed_when: false
+
+- name: Stop and remove Candlepin container
+  command:
+    argv:
+      - podman
+      - stop
+      - candlepin
+  changed_when: true
+  when:
+    - lsr_rhc_test_data_file | length == 0
+    - '"candlepin" in __rhc_candlepin_cont_exists.stdout'

tests/tasks/remove_candlepin_container.yml

@@ -36,8 +36,8 @@
         use: "{{ __rhc_is_ostree |
                  ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
-    - name: Stop and remove Candlepin container
-      include_tasks: cleanup_candlepin_container.yml
+    - name: Remove Candlepin container
+      include_tasks: remove_candlepin_container.yml
 
     - name: Start Candlepin container
       vars:

tests/tasks/setup_candlepin.yml

@@ -109,6 +109,4 @@
                 rhc_state: absent
       always:
         - name: Clean up Candlepin container
-          include_tasks: tasks/cleanup_candlepin_container.yml
-          vars:
-            __rhc_cleanup_image: true
+          include_tasks: tasks/remove_candlepin_container.yml

tests/tests_environments.yml

@@ -357,9 +357,7 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/cleanup_candlepin_container.yml
-          vars:
-            __rhc_cleanup_image: true
+          include_tasks: tasks/remove_candlepin_container.yml
 
         - name: Remove SELinux policy for proxy ports
           include_role:

tests/tests_proxy.yml

@@ -190,6 +190,4 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/cleanup_candlepin_container.yml
-          vars:
-            __rhc_cleanup_image: true
+          include_tasks: tasks/remove_candlepin_container.yml

tests/tests_register_unregister.yml

@@ -102,6 +102,4 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/cleanup_candlepin_container.yml
-          vars:
-            __rhc_cleanup_image: true
+          include_tasks: tasks/remove_candlepin_container.yml