Skip to content

Commit cfcc0f0

Browse files
committed
test(podman): use public Alpine reference image
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent db81056 commit cfcc0f0

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

tests/ansible/playbooks/drivers/podman/default-userns-baseline.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
hosts: all
77
gather_facts: false
88
vars:
9-
podman_reference_image: "{{ openshell_conformance_image }}"
9+
podman_reference_image: "{{ openshell_podman_reference_image }}"
1010
podman_reference_uid_map: /var/lib/openshell-test-inputs/podman/reference-uid-map
1111
tasks:
1212
- name: Wait for SSH
@@ -67,6 +67,16 @@
6767
group: tmachine
6868
mode: "0700"
6969

70+
- name: Pull the Podman reference image
71+
become: true
72+
become_user: tmachine
73+
ansible.builtin.command:
74+
argv: [podman, pull, "{{ podman_reference_image }}"]
75+
environment:
76+
HOME: /home/tmachine
77+
XDG_RUNTIME_DIR: "/run/user/{{ tmachine_uid.stdout }}"
78+
changed_when: false
79+
7080
- name: Capture direct Podman default UID mapping
7181
become: true
7282
become_user: tmachine

tests/ansible/playbooks/drivers/podman/userns-profile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
hosts: all
77
gather_facts: false
88
vars:
9-
podman_reference_image: "{{ openshell_conformance_image }}"
9+
podman_reference_image: "{{ openshell_podman_reference_image }}"
1010
podman_reference_uid_map: /var/lib/openshell-test-inputs/podman/reference-uid-map
1111
tasks:
1212
- name: Wait for SSH

tests/config.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ let
128128
];
129129
inputs = {
130130
openshell_podman_test_bundle = "../artifacts/test-archives/${muslTarget}/openshell-podman-tests.tar";
131-
# The tarball is built from a digest-pinned Alpine image, then tagged
132-
# explicitly so its name is stable after the installer loads it.
133-
openshell_conformance_image = "localhost/openshell/conformance:tmachine";
131+
# Use the same public image as the compiled driver default so direct
132+
# Podman and OpenShell containers exercise identical image metadata.
133+
openshell_podman_reference_image = "docker.io/library/alpine:3.22";
134134
openshell_podman_userns_auto_config = "suites/drivers/podman/fixtures/userns-auto.toml";
135135
openshell_podman_userns_keep_id_config = "suites/drivers/podman/fixtures/userns-keep-id.toml";
136136
openshell_podman_userns_private_config = "suites/drivers/podman/fixtures/userns-private.toml";

0 commit comments

Comments
 (0)