Compare commits

...

4 commits

Author SHA1 Message Date
Mohammed Naser
4fc3d20479
Merge a3bedab1ba into b228507b62 2024-06-14 23:16:06 +01:00
softwarefactory-project-zuul[bot]
b228507b62
Merge pull request #550 from saito-hideki/pr/azp_update_image
[CI] Bump Azure test container to 6.0.0

SUMMARY
Replace AZP container image version with 6.0.0:

Fixes #549

ISSUE TYPE

CI tests Pull Request

COMPONENT NAME

ansible.posix

ADDITIONAL INFORMATION
See ansible-collections/news-for-maintainers#71
2024-06-12 00:17:48 +00:00
Hideki Saito
0341c9420f
Replace AZP default image with 6.0.0
- See https://github.com/ansible-collections/news-for-maintainers/issues/71

Signed-off-by: Hideki Saito <saito@fgrep.org>
2024-06-12 08:35:57 +09:00
Mohammed Naser
a3bedab1ba
synchronize: use _find_needle instead 2023-03-21 18:46:25 -04:00
2 changed files with 2 additions and 5 deletions

View file

@ -37,7 +37,7 @@ variables:
resources: resources:
containers: containers:
- container: default - container: default
image: quay.io/ansible/azure-pipelines-test-container:main image: quay.io/ansible/azure-pipelines-test-container:6.0.0
pool: Standard pool: Standard

View file

@ -48,10 +48,7 @@ class ActionModule(ActionBase):
if ':' in path or path.startswith('/'): if ':' in path or path.startswith('/'):
return path return path
if self._task._role is not None: path = self._find_needle('files', path)
path = self._loader.path_dwim_relative(self._task._role._role_path, 'files', path)
else:
path = self._loader.path_dwim_relative(self._loader.get_basedir(), 'files', path)
if original_path and original_path[-1] == '/' and path[-1] != '/': if original_path and original_path[-1] == '/' and path[-1] != '/':
# make sure the dwim'd path ends in a trailing "/" # make sure the dwim'd path ends in a trailing "/"