Skip to content

Commit 27205ad

Browse files
committed
bug: align required collections between drivers podman and containers
The `containers` driver might use the `podman` driver as a backend and should therefore report the same required collection version of `containers.podman`. Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
1 parent b712a4a commit 27205ad

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

requirements.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ collections:
66
- name: community.docker
77
version: ">=3.10.2" # keep in sync with src/molecule_plugins/docker/driver.py and src/molecule_plugins/containers/driver.py
88
- name: containers.podman
9+
version: ">=1.8.1" # keep in sync with src/molecule_plugins/podman/driver.py and src/molecule_plugins/containers/driver.py
910
- name: azure.azcollection
1011
version: ">=1,<2"
1112
- name: community.crypto

src/molecule_plugins/containers/driver.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def __init__(self, config=None) -> None:
4545
@property
4646
def required_collections(self) -> dict[str, str]:
4747
"""Return collections dict containing names and versions required."""
48+
# keep in sync with src/molecule_plugins/docker/driver.py, src/molecule_plugins/podman/driver.py and requirements.yml
4849
return {
4950
"ansible.posix": "1.4.0", # keep in sync with src/molecule_plugins/docker/driver.py and requirements.yml
5051
"community.docker": "3.10.2", # keep in sync with src/molecule_plugins/docker/driver.py and requirements.yml

src/molecule_plugins/podman/driver.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ def sanity_checks(self):
243243
@property
244244
def required_collections(self) -> dict[str, str]:
245245
"""Return collections dict containing names and versions required."""
246-
return {"containers.podman": "1.7.0"}
246+
# keep in sync with src/molecule_plugins/container/driver.py and requirements.yml
247+
return {"containers.podman": "1.8.1"}
247248

248249
def reset(self):
249250
# edge case: podman not installed, but the plugin exists and is properly initialized

0 commit comments

Comments
 (0)