Modify volume mount behavior when source does not exist (#1408)

Pass through container volume mounts as-is.

ansible-runner will ignore adding the mountpoint to the '-v` argument list if
the source path does not exist. Instead it should respect whatever the
user is passing to the '--container-volume-mount' option. The exception would
be if the user tried to pass a file as the source path; ansible-runner should
resolve the file's parent directory.

(cherry picked from commit 2989177)

Author: demonpig

src/ansible_runner/config/_base.py

@@ -568,10 +568,7 @@ def wrap_args_for_containerization(self,
             for mapping in self.container_volume_mounts:
                 volume_mounts = mapping.split(':', 2)
                 self._ensure_path_safe_to_mount(volume_mounts[0])
-                labels = None
-                if len(volume_mounts) == 3:
-                    labels = f":{volume_mounts[2]}"
-                self._update_volume_mount_paths(new_args, volume_mounts[0], dst_mount_path=volume_mounts[1], labels=labels)
+                new_args.extend(["-v", mapping])
 
         # Reference the file with list of keys to pass into container
         # this file will be written in ansible_runner.runner

test/unit/config/test__base.py

@@ -276,7 +276,7 @@ def test_container_volume_mounting_with_Z(tmp_path, mocker):
     for i, entry in enumerate(new_args):
         if entry == '-v':
             mount = new_args[i + 1]
-            if mount.endswith('project_path/:Z'):
+            if mount.endswith('project_path:Z'):
                 break
     else:
         raise Exception(f'Could not find expected mount, args: {new_args}')
@@ -318,7 +318,7 @@ def test_containerization_settings(tmp_path, runtime, mocker):
         '--workdir',
         '/runner/project',
         '-v', f'{str(tmp_path)}/.ssh/:/home/runner/.ssh/',
-        '-v', f'{str(tmp_path)}/.ssh/:/root/.ssh/',
+        '-v', f'{str(tmp_path)}/.ssh/:/root/.ssh/'
     ]
 
     if os.path.exists('/etc/ssh/ssh_known_hosts'):
@@ -330,6 +330,8 @@ def test_containerization_settings(tmp_path, runtime, mocker):
     expected_command_start.extend([
         '-v', f'{rc.private_data_dir}/artifacts/:/runner/artifacts/:Z',
         '-v', f'{rc.private_data_dir}/:/runner/:Z',
+        '-v', '/host1:/container1',
+        '-v', 'host2:/container2',
         '--env-file', f'{rc.artifact_dir}/env.list',
     ])
 

test/unit/config/test_runner.py

@@ -684,7 +684,7 @@ def test_container_volume_mounting_with_Z(mocker, tmp_path):
     for i, entry in enumerate(new_args):
         if entry == '-v':
             mount = new_args[i + 1]
-            if mount.endswith(':/tmp/project_path/:Z'):
+            if mount.endswith(':/tmp/project_path:Z'):
                 break
     else:
         raise Exception(f'Could not find expected mount, args: {new_args}')
@@ -728,7 +728,7 @@ def test_containerization_settings(tmp_path, runtime, mocker):
 
     expected_command_start = [runtime, 'run', '--rm', '--tty', '--interactive', '--workdir', '/runner/project'] + \
         ['-v', f'{rc.private_data_dir}/:/runner/:Z'] + \
-        ['-v', '/host1/:/container1/', '-v', '/host2/:/container2/'] + \
+        ['-v', '/host1:/container1', '-v', '/host2:/container2'] + \
         ['--env-file', f'{rc.artifact_dir}/env.list'] + \
         extra_container_args + \
         ['--name', 'ansible_runner_foo'] + \