From 0913c463577ae9604261d4de20190cc3986121f4 Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Thu, 25 Nov 2021 10:40:26 +0200
Subject: [PATCH] Use podman driver with molecule

Change-Id: I3d16e7e7de8afe123ee2b7175c242ceaf3c0af65
---
 .../molecule/default/molecule.yml             |  4 +--
 .../molecule/infrared/molecule.yml            |  4 +--
 tox.ini                                       |  5 ++--
 zuul.d/layout.yaml                            | 10 +++++++-
 zuul.d/playbooks/pre.yml                      | 25 +++++++++++++++++++
 5 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 zuul.d/playbooks/pre.yml

diff --git a/roles/collect_logs/molecule/default/molecule.yml b/roles/collect_logs/molecule/default/molecule.yml
index 5a6ea56..ac63fe0 100644
--- a/roles/collect_logs/molecule/default/molecule.yml
+++ b/roles/collect_logs/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 log: true
 platforms:
   # - name: centos7
@@ -22,8 +22,6 @@ provisioner:
       forks: 50
       stdout_callback: yaml
       timeout: 30
-    ssh_connection:
-      pipelining: true
   inventory:
     group_vars:
       all:
diff --git a/roles/collect_logs/molecule/infrared/molecule.yml b/roles/collect_logs/molecule/infrared/molecule.yml
index b22c6ec..9b05f43 100644
--- a/roles/collect_logs/molecule/infrared/molecule.yml
+++ b/roles/collect_logs/molecule/infrared/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 log: true
 platforms:
   # - name: centos7
@@ -22,8 +22,6 @@ provisioner:
       forks: 50
       stdout_callback: yaml
       timeout: 30
-    ssh_connection:
-      pipelining: true
   inventory:
     group_vars:
       all:
diff --git a/tox.ini b/tox.ini
index ca3c72b..1cd5a5a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@ usedevelop = True
 passenv =
     ANSIBLE_*
     CURL_CA_BUNDLE
+    PODMAN_*
     DOCKER_*
     HOME
     REQUESTS_CA_BUNDLE
@@ -60,11 +61,11 @@ setenv =
     PYTEST_REQPASS=2
 deps =
     ansible-core>=2.11,<2.12
-    molecule[test,docker]>=3.3.2,<3.4  # MIT
+    molecule[test,podman]>=3.3.2,<3.4  # MIT
     pytest-molecule>=1.4.0
     pytest-plus  # provides support for PYTEST_REQPASS
 commands =
-    ansible-galaxy collection install --force community.docker:=1.10.0 community.general:=4.0.2
+    ansible-galaxy collection install --force containers.podman:=1.8.2 community.general:=4.0.2
     python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} -k molecule {posargs}
 
 [testenv:ansible]
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 645d2b0..bf70153 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -27,13 +27,21 @@
     irrelevant-files:
       - ^vars/sova-patterns.yml$
 
+- job:
+    description: Molecule job
+    name: tripleo-logs-tox-molecule
+    parent: tripleo-tox-molecule
+    pre-run:
+      - zuul.d/playbooks/pre.yml
+    timeout: 3600
+
 - project:
     vars:
       fail_logs_collection: true
     check:
       jobs: &jobs
         - openstack-tox-linters
-        - openstack-tox-molecule
+        - tripleo-logs-tox-molecule
         - tox-ansible-test-sanity
         - tox-ansible-test-units
         - zuul-ansible-role-collect-logs
diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml
new file mode 100644
index 0000000..eea6858
--- /dev/null
+++ b/zuul.d/playbooks/pre.yml
@@ -0,0 +1,25 @@
+---
+- hosts: all
+  tasks:
+
+    - name: Remove docker from molecule
+      become: true
+      package:
+        name:
+          - docker-ce
+          - docker-ce-cli
+          - containerd.io
+        state: absent
+
+    - name: Set containers module to 3.0
+      become: true
+      shell: |
+        dnf module disable container-tools:rhel8 -y
+        dnf module enable container-tools:3.0 -y
+        dnf clean metadata
+      tags:
+        - skip_ansible_lint
+
+    - name: Install podman
+      include_role:
+        name: ensure-podman