ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-15 19:42:06 +00:00
Code Packages Projects Releases Wiki Activity

CI: Start using Ubuntu VMs instead of RHEL VMs (#1128)

Browse Source 
* Start using Ubuntu VMs instead of RHEL VMs.

* Use correct Python executable.

* Fix starting podman on non-RHEL systems.
This commit is contained in:
Felix Fontein 2025-09-14 23:27:52 +02:00 committed by GitHub
parent 93d165e10b
commit 2b5c06da20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.azure-pipelines/azure-pipelines.yml
View File

@ -228,6 +228,8 @@ stages:
targets:
- name: RHEL 9.6 with Docker SDK, urllib3, requests from sources
test: rhel/9.6-dev-latest
- name: Ubuntu 24.04
test: ubuntu/24.04
groups:
- 1
- 2
@ -244,6 +246,8 @@ stages:
targets:
- name: RHEL 9.5
test: rhel/9.5
- name: Ubuntu 22.04
test: ubuntu/22.04
groups:
- 1
- 2
@ -290,8 +294,6 @@ stages:
parameters:
testFormat: 2.16/{0}
targets:
- name: RHEL 9.2
test: rhel/9.2
- name: RHEL 8.8
test: rhel/8.8
- name: RHEL 7.9

4
tests/integration/targets/docker_config/tasks/test_docker_config.yml
View File

@ -4,14 +4,14 @@
# SPDX-License-Identifier: GPL-3.0-or-later
- block:
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | python -m json.tool"
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | {{ ansible_python_interpreter }} -m json.tool"
- name: Make sure we're not already using Docker swarm
docker_swarm:
state: absent
force: true
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | python -m json.tool"
- shell: "docker info --format '{% raw %}{{json .}}{% endraw %}' | {{ ansible_python_interpreter }} -m json.tool"
- name: Create a Swarm cluster
docker_swarm:

2
tests/integration/targets/setup_podman/tasks/main.yml
View File

@ -57,7 +57,7 @@
systemd_service:
name: "{{ podman_socket_service }}"
state: started
scope: "{{ 'global' if podman_user_id.stdout == '0' else 'user' }}"
scope: "{{ 'global' if podman_user_id.stdout == '0' and ansible_facts.os_family == 'RedHat' else 'user' }}"
environment:
XDG_RUNTIME_DIR: "{{ '/run' if podman_user_id.stdout == '0' else ('/run/user/' ~ podman_user_id.stdout) }}"