Skip to content

Commit 35dc39b

Browse files
Merge pull request openstack-k8s-operators#811 from rabi/fix_molecule
Fix edpm_multipathd and other molecule tests
2 parents 15de57d + 26d8205 commit 35dc39b

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

.github/workflows/molecule.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install ansible
6060
run: pip install ansible
6161
- name: Install collections
62-
run: ansible-galaxy collection install -r requirements.yml
62+
run: ansible-galaxy collection install --force -r requirements.yml
6363
- name: Install molecule deps
6464
run: pip install -r molecule-requirements.txt
6565
- name: Run molecule test

roles/edpm_multipathd/molecule/default/prepare.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# License for the specific language governing permissions and limitations
1515
# under the License.
1616

17-
- name: Prepare
17+
- name: Prepare test deps
1818
hosts: all
1919
gather_facts: false
2020
roles:
@@ -23,4 +23,14 @@
2323
- iproute
2424
- iscsi-initiator-utils
2525
- podman
26-
- role: env_data
26+
- name: Prepare
27+
hosts: all
28+
roles:
29+
- role: osp.edpm.env_data
30+
tasks:
31+
- name: set /etc/localtime
32+
become: true
33+
ansible.builtin.file:
34+
path: /etc/localtime
35+
src: /usr/share/zoneinfo/UTC
36+
state: link

roles/edpm_telemetry/molecule/default/prepare.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
state: directory
3535
mode: "0775"
3636

37+
- name: set /etc/localtime
38+
become: true
39+
ansible.builtin.file:
40+
path: /etc/localtime
41+
src: /usr/share/zoneinfo/UTC
42+
state: link
43+
3744
- name: Create /run/libvirt directory
3845
ansible.builtin.file:
3946
path: "/run/libvirt"

scripts/molecule_venv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ fi
2121
source $LOCAL_MOLECULE_ENV/bin/activate
2222

2323
pip install -r molecule-requirements.txt
24-
ansible-galaxy collection install -r requirements.yml
24+
ansible-galaxy collection install --force -r requirements.yml
2525
./scripts/test_roles.py
2626
deactivate

0 commit comments

Comments
 (0)