mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 23:25:28 +01:00
Compare commits
4 commits
7aff9810ad
...
0ac3ad0925
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ac3ad0925 | ||
|
|
542643e786 | ||
|
|
2cde4cdb26 | ||
|
|
12ecc3823b |
3 changed files with 12 additions and 8 deletions
|
|
@ -36,7 +36,7 @@ variables:
|
||||||
resources:
|
resources:
|
||||||
containers:
|
containers:
|
||||||
- container: default
|
- container: default
|
||||||
image: quay.io/ansible/azure-pipelines-test-container:3.0.0
|
image: quay.io/ansible/azure-pipelines-test-container:4.0.1
|
||||||
|
|
||||||
pool: Standard
|
pool: Standard
|
||||||
|
|
||||||
|
|
@ -217,8 +217,6 @@ stages:
|
||||||
test: rhel/8.8
|
test: rhel/8.8
|
||||||
- name: RHEL 9.2
|
- name: RHEL 9.2
|
||||||
test: rhel/9.2
|
test: rhel/9.2
|
||||||
- name: FreeBSD 12.4
|
|
||||||
test: freebsd/12.4
|
|
||||||
- name: FreeBSD 13.2
|
- name: FreeBSD 13.2
|
||||||
test: freebsd/13.2
|
test: freebsd/13.2
|
||||||
- stage: Remote_2_15
|
- stage: Remote_2_15
|
||||||
|
|
@ -317,8 +315,6 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: 2.10/{0}/1
|
testFormat: 2.10/{0}/1
|
||||||
targets:
|
targets:
|
||||||
- name: OS X 10.11
|
|
||||||
test: osx/10.11
|
|
||||||
- name: RHEL 7.9
|
- name: RHEL 7.9
|
||||||
test: rhel/7.9
|
test: rhel/7.9
|
||||||
- name: RHEL 8.2
|
- name: RHEL 8.2
|
||||||
|
|
@ -331,8 +327,6 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: 2.9/{0}/1
|
testFormat: 2.9/{0}/1
|
||||||
targets:
|
targets:
|
||||||
- name: OS X 10.11
|
|
||||||
test: osx/10.11
|
|
||||||
- name: RHEL 7.9
|
- name: RHEL 7.9
|
||||||
test: rhel/7.9
|
test: rhel/7.9
|
||||||
- name: RHEL 8.1
|
- name: RHEL 8.1
|
||||||
|
|
|
||||||
3
changelogs/fragments/487_ci_update.yml
Normal file
3
changelogs/fragments/487_ci_update.yml
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
trivial:
|
||||||
|
- "Drop FreeBSD12.4 from CI for ansible-core:devel(https://github.com/ansible-collections/ansible.posix/issues/486)."
|
||||||
|
|
@ -77,7 +77,14 @@ class ActionModule(ActionBase):
|
||||||
|
|
||||||
if self._host_is_ipv6_address(host):
|
if self._host_is_ipv6_address(host):
|
||||||
return '[%s%s]:%s' % (user_prefix, host, path)
|
return '[%s%s]:%s' % (user_prefix, host, path)
|
||||||
|
|
||||||
|
#preserve formatting of remote paths if host or user@host is explicitly defined in the path
|
||||||
|
if ':' not in path:
|
||||||
return '%s%s:%s' % (user_prefix, host, path)
|
return '%s%s:%s' % (user_prefix, host, path)
|
||||||
|
elif '@' not in path:
|
||||||
|
return '%s%s' % (user_prefix, path)
|
||||||
|
else:
|
||||||
|
return path
|
||||||
|
|
||||||
def _process_origin(self, host, path, user):
|
def _process_origin(self, host, path, user):
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue