Skip to content

Commit 860aa53

Browse files
committed
fix(tmachine): support rootful Podman E2E fixtures
Signed-off-by: Evan Lezar <[email protected]>
1 parent 221cf8a commit 860aa53

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

  • tests/ansible/playbooks/drivers/podman

‎tests/ansible/playbooks/drivers/podman/e2e.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
ansible.builtin.include_role:
2020
name: tmachine_container_runtime
2121

22-
- name: Require rootless Podman for the E2E workload fixtures
22+
- name: Require Podman for the E2E workload fixtures
2323
ansible.builtin.assert:
2424
that:
2525
- tmachine_container_runtime_name == 'podman'
26-
- tmachine_container_runtime_is_rootless
27-
fail_msg: The Podman E2E archive requires the rootless Podman environment
26+
fail_msg: The Podman E2E archive requires a Podman environment
2827

2928
- name: Create Podman E2E test directory
3029
become: true
@@ -53,9 +52,13 @@
5352
mode: "0600"
5453

5554
- name: Load Podman E2E workload image
55+
become: "{{ not tmachine_container_runtime_is_rootless }}"
5656
ansible.builtin.command:
5757
argv:
5858
- podman
59+
- --remote
60+
- --url
61+
- "unix://{{ tmachine_container_runtime_socket }}"
5962
- load
6063
- --input
6164
- "{{ podman_e2e_test_root }}/openshell-e2e-python-dev.tar"
@@ -64,6 +67,7 @@
6467
XDG_RUNTIME_DIR: "/run/user/{{ tmachine_container_runtime_tmachine_uid.stdout }}"
6568

6669
- name: Run Podman E2E archive tests
70+
become: "{{ not tmachine_container_runtime_is_rootless }}"
6771
ansible.builtin.command:
6872
argv:
6973
- cargo-nextest

0 commit comments

Comments
 (0)