From 26d820580062fd4df6bc854883c3aad59c93af27 Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Thu, 14 Nov 2024 10:02:00 +0530
Subject: [PATCH 1/2] Fix edpm_multipathd molecule job

Currently it fails with

`statfs /etc/localtime: no such file or directory`

Also, force update collections to avoid other molecule failures
related to containers.podman.

Signed-off-by: rabi <ramishra@redhat.com>
---
 .github/workflows/molecule.yaml                    |  2 +-
 roles/edpm_multipathd/molecule/default/prepare.yml | 14 ++++++++++++--
 roles/edpm_telemetry/molecule/default/prepare.yml  |  7 +++++++
 scripts/molecule_venv.sh                           |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/molecule.yaml b/.github/workflows/molecule.yaml
index 0d1e72d9a..80db37c4d 100644
--- a/.github/workflows/molecule.yaml
+++ b/.github/workflows/molecule.yaml
@@ -59,7 +59,7 @@ jobs:
     - name: Install ansible
       run: pip install ansible
     - name: Install collections
-      run: ansible-galaxy collection install -r requirements.yml
+      run: ansible-galaxy collection install --force -r requirements.yml
     - name: Install molecule deps
       run: pip install -r molecule-requirements.txt
     - name: Run molecule test
diff --git a/roles/edpm_multipathd/molecule/default/prepare.yml b/roles/edpm_multipathd/molecule/default/prepare.yml
index a8c1e5639..83c61e5c5 100644
--- a/roles/edpm_multipathd/molecule/default/prepare.yml
+++ b/roles/edpm_multipathd/molecule/default/prepare.yml
@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Prepare
+- name: Prepare test deps
   hosts: all
   gather_facts: false
   roles:
@@ -23,4 +23,14 @@
         - iproute
         - iscsi-initiator-utils
         - podman
-    - role: env_data
+- name: Prepare
+  hosts: all
+  roles:
+    - role: osp.edpm.env_data
+  tasks:
+    - name: set /etc/localtime
+      become: true
+      ansible.builtin.file:
+        path: /etc/localtime
+        src: /usr/share/zoneinfo/UTC
+        state: link
diff --git a/roles/edpm_telemetry/molecule/default/prepare.yml b/roles/edpm_telemetry/molecule/default/prepare.yml
index 38bdb3f4b..ba5277fc6 100644
--- a/roles/edpm_telemetry/molecule/default/prepare.yml
+++ b/roles/edpm_telemetry/molecule/default/prepare.yml
@@ -34,6 +34,13 @@
         state: directory
         mode: "0775"
 
+    - name: set /etc/localtime
+      become: true
+      ansible.builtin.file:
+        path: /etc/localtime
+        src: /usr/share/zoneinfo/UTC
+        state: link
+
     - name: Create /run/libvirt directory
       ansible.builtin.file:
         path: "/run/libvirt"
diff --git a/scripts/molecule_venv.sh b/scripts/molecule_venv.sh
index 3157f8710..72f1e5fdb 100755
--- a/scripts/molecule_venv.sh
+++ b/scripts/molecule_venv.sh
@@ -21,6 +21,6 @@ fi
 source $LOCAL_MOLECULE_ENV/bin/activate
 
 pip install -r molecule-requirements.txt
-ansible-galaxy collection install -r requirements.yml
+ansible-galaxy collection install --force -r requirements.yml
 ./scripts/test_roles.py
 deactivate

From dc975811562395bbcb2f3eacb19976b75d6748fa Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Thu, 14 Nov 2024 08:39:23 +0530
Subject: [PATCH 2/2] Fix github workflow to use Containerfile

We changed the file but did not update the workflow.

Signed-off-by: rabi <ramishra@redhat.com>
---
 .github/workflows/openstack-ansibleee-runner.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/openstack-ansibleee-runner.yaml b/.github/workflows/openstack-ansibleee-runner.yaml
index e26b12b77..afe3e157f 100644
--- a/.github/workflows/openstack-ansibleee-runner.yaml
+++ b/.github/workflows/openstack-ansibleee-runner.yaml
@@ -55,7 +55,7 @@ jobs:
         image: openstack-ansibleee-runner
         tags: ${{ env.latesttag }} ${{ github.sha }} current-podified
         containerfiles: |
-          ./openstack_ansibleee/Dockerfile
+          ./openstack_ansibleee/Containerfile
 
     - name: Push openstack-ansibleee-runner To ${{ env.imageregistry }}
       uses: redhat-actions/push-to-registry@v2