Merge 9e570ca05e into 05ee6ebc2a

Signed-off-by: Adam Miller <admiller@redhat.com>

.azure-pipelines/azure-pipelines.yml

@@ -98,6 +98,19 @@ stages:
               test: sanity
             - name: Units
               test: units
+  - stage: Sanity_2_9
+    displayName: Ansible 2.9 sanity
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.9/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
   ## Docker
   - stage: Docker_devel
     displayName: Docker devel
@@ -166,6 +179,26 @@ stages:
               test: ubuntu2004
             - name: Ubuntu 22.04
               test: ubuntu2204
+  - stage: Docker_2_9
+    displayName: Docker 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.9/linux/{0}/1
+          targets:
+            - name: CentOS 6
+              test: centos6
+            - name: CentOS 7
+              test: centos7
+            - name: openSUSE 15 py2
+              test: opensuse15py2
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 16.04
+              test: ubuntu1604
+            - name: Ubuntu 18.04
+              test: ubuntu1804
 
   ## Remote
   - stage: Remote_devel
@@ -229,12 +262,27 @@ stages:
               test: freebsd/13.1
             - name: FreeBSD 12.4
               test: freebsd/12.4
+  - stage: Remote_2_9
+    displayName: Remote 2.9
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.9/{0}/1
+          targets:
+            - name: RHEL 7.9
+              test: rhel/7.9
+            - name: RHEL 8.1
+              test: rhel/8.1
 
   ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
+      - Sanity_2_9
+      - Remote_2_9
+      - Docker_2_9
       - Sanity_2_14
       - Remote_2_14
       - Docker_2_14

README.md

@@ -87,6 +87,7 @@ None
 - ansible-core 2.16 (stable)
 - ansible-core 2.15 (stable)
 - ansible-core 2.14 (stable)
+- ansible 2.9 (old-stable)
 
 ## Roadmap
 

changelogs/fragments/dropping-ansible29.yml

@@ -1,2 +0,0 @@
-major_changes:
-  - "Dropping support for Ansible 2.9, ansible-core 2.14 will be minimum required version for this release"

plugins/action/synchronize.py

@@ -177,7 +177,7 @@ class ActionModule(ActionBase):
 
         # Store remote connection type
         self._remote_transport = self._connection.transport
-        use_ssh_args = _tmp_args.pop('use_ssh_args', False)
+        use_ssh_args = _tmp_args.pop('use_ssh_args', None)
 
         if use_ssh_args and self._connection.transport == 'ssh':
             ssh_args = [
@@ -185,7 +185,7 @@ class ActionModule(ActionBase):
                 self._connection.get_option('ssh_common_args'),
                 self._connection.get_option('ssh_extra_args'),
             ]
-            _tmp_args['_ssh_args'] = ' '.join([a for a in ssh_args if a])
+            _tmp_args['ssh_args'] = ' '.join([a for a in ssh_args if a])
 
         # Handle docker connection options
         if self._remote_transport in DOCKER:

plugins/modules/synchronize.py

@@ -26,13 +26,13 @@ options:
     description:
       - Path on the source host that will be synchronized to the destination.
       - The path can be absolute or relative.
-    type: path
+    type: str
     required: true
   dest:
     description:
       - Path on the destination host that will be synchronized from the source.
       - The path can be absolute or relative.
-    type: path
+    type: str
     required: true
   dest_port:
     description:
@@ -150,7 +150,7 @@ options:
       - Specify additional rsync options by passing in an array.
       - Note that an empty string in C(rsync_opts) will end up transfer the current working directory.
     type: list
-    default: []
+    default:
     elements: str
   partial:
     description:
@@ -186,23 +186,6 @@ options:
         C(ansible_ssh_args), C(ansible_ssh_common_args), and C(ansible_ssh_extra_args).
     type: bool
     default: false
-  _local_rsync_path:
-    description: Internal use only.
-    type: path
-    default: 'rsync'
-    required: false
-  _local_rsync_password:
-    description: Internal use only, never logged.
-    type: str
-    required: false
-  _substitute_controller:
-    description: Internal use only.
-    type: bool
-    default: false
-  _ssh_args:
-    description: Internal use only. See C(use_ssh_args) for ssh arg settings.
-    type: str
-    required: false
 
 notes:
    - rsync must be installed on both the local and remote host.
@@ -429,8 +412,7 @@ def main():
             set_remote_user=dict(type='bool', default=True),
             rsync_timeout=dict(type='int', default=0),
             rsync_opts=dict(type='list', default=[], elements='str'),
-            _ssh_args=dict(type='str'),
+            ssh_args=dict(type='str'),
-            use_ssh_args=dict(type='bool', default=False),
             ssh_connection_multiplexing=dict(type='bool', default=False),
             partial=dict(type='bool', default=False),
             verify_host=dict(type='bool', default=False),
@@ -472,7 +454,7 @@ def main():
     owner = module.params['owner']
     group = module.params['group']
     rsync_opts = module.params['rsync_opts']
-    ssh_args = module.params['_ssh_args']
+    ssh_args = module.params['ssh_args']
     ssh_connection_multiplexing = module.params['ssh_connection_multiplexing']
     verify_host = module.params['verify_host']
     link_dest = module.params['link_dest']

tests/sanity/ignore-2.9.txt

@@ -0,0 +1,2 @@
+tests/utils/shippable/check_matrix.py replace-urlopen
+tests/utils/shippable/timing.py shebang