tests/functional: change docker to podman

Some docker commands were hardcoded in tests playbooks and some
conditions were not taking care of the containerized_deployment
variable but only the atomic fact.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tests/functional/rbd_map_devices.yml b/tests/functional/rbd_map_devices.yml
index 8dcaa053d5382b635298d71175de422f4dda85fa..47bfc29751630b380bf7c1eec0b816e618ab42c1 100644 (file)
--- a/tests/functional/rbd_map_devices.yml
+++ b/tests/functional/rbd_map_devices.yml
@@ -28,15 +28,19 @@
     - name: create an rbd image - non container
       command: "rbd create --size=1024 test/rbd_test"
       delegate_to: "mon0"
-      when: not is_atomic
+      when:
+        - not is_atomic | bool
+        - not containerized_deployment | default(false) | bool
 
     - name: create an rbd image - container
-      command: "docker run --rm -v /etc/ceph:/etc/ceph --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} create --size=1024 test/rbd_test"
+      command: "podman run --rm -v /etc/ceph:/etc/ceph --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} create --size=1024 test/rbd_test"
       delegate_to: "mon0"
-      when: is_atomic
+      when: is_atomic | bool or containerized_deployment | default(false) | bool
 
     - name: non container
-      when: not is_atomic
+      when:
+        - not is_atomic | bool
+        - not containerized_deployment | default(false) | bool
       block:
         - name: disable features unsupported by the kernel
           command: rbd feature disable test/rbd_test object-map fast-diff deep-flatten
@@ -45,10 +49,10 @@
           command: rbd map test/rbd_test
 
     - name: container
-      when: is_atomic
+      when: is_atomic | bool or containerized_deployment | default(false) | bool
       block:
         - name: disable features unsupported by the kernel
-          command: "docker run --rm -v /etc/ceph:/etc/ceph --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} feature disable test/rbd_test object-map fast-diff deep-flatten"
+          command: "podman run --rm -v /etc/ceph:/etc/ceph --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} feature disable test/rbd_test object-map fast-diff deep-flatten"
 
         - name: map a device
-          command: "docker run --rm --privileged -v /etc/ceph:/etc/ceph -v /dev:/dev --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} map test/rbd_test"
+          command: "podman run --rm --privileged -v /etc/ceph:/etc/ceph -v /dev:/dev --net=host --entrypoint=rbd {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} map test/rbd_test"

diff --git a/tests/functional/rgw_multisite.yml b/tests/functional/rgw_multisite.yml
index 222c3801e688e41a964ab2c3a5671827899680cc..984501a5ac61d099d05c67e071517cfb9200f101 100644 (file)
--- a/tests/functional/rgw_multisite.yml
+++ b/tests/functional/rgw_multisite.yml
@@ -25,7 +25,7 @@
 
     - name: generate and upload a random 10Mb file - containerized deployment
       command: >
-        docker run --rm --name=rgw_multisite_test --entrypoint=/bin/bash {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} -c 'dd if=/dev/urandom of=/tmp/testinfra.img bs=1M count=10; {{ s3cmd_cmd }} mb s3://testinfra; {{ s3cmd_cmd }} put /tmp/testinfra.img s3://testinfra'
+        podman run --rm --name=rgw_multisite_test --entrypoint=/bin/bash {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} -c 'dd if=/dev/urandom of=/tmp/testinfra.img bs=1M count=10; {{ s3cmd_cmd }} mb s3://testinfra; {{ s3cmd_cmd }} put /tmp/testinfra.img s3://testinfra'
       when:
         - rgw_zonemaster | bool
         - containerized_deployment | default(False) | bool
@@ -41,7 +41,7 @@
 
     - name: get info from replicated file - containerized deployment
       command: >
-        docker run --rm --name=rgw_multisite_test --entrypoint=/bin/bash {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} -c '{{ s3cmd_cmd }} info s3://testinfra/testinfra.img'
+        podman run --rm --name=rgw_multisite_test --entrypoint=/bin/bash {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} -c '{{ s3cmd_cmd }} info s3://testinfra/testinfra.img'
       register: s3cmd_info_status
       when:
         - not rgw_zonemaster | default(False) | bool