@@ -79,14 +79,7 @@ ansible.egg-info/

 # Release directory

 packaging/release/ansible_release

 /.cache/

-/test/results/coverage/*=coverage.*

-/test/results/coverage/coverage*

-/test/results/reports/coverage*.xml

-/test/results/reports/coverage*/

-/test/results/bot/*.json

-/test/results/junit/*.xml

-/test/results/logs/*.log

-/test/results/data/*.json

+/test/results/

 /test/integration/cloud-config-aws.yml

 /test/integration/inventory.networking

 /test/integration/inventory.winrm

deleted file mode 100644

@@ -16,6 +16,9 @@ def main():

     import traceback

     import warnings

+    import_dir = os.environ['SANITY_IMPORT_DIR']

+    minimal_dir = os.environ['SANITY_MINIMAL_DIR']

+

     try:

         import importlib.util

         imp = None  # pylint: disable=invalid-name

@@ -266,9 +269,6 @@ def main():

             filepath = os.path.relpath(warning.filename)

             lineno = warning.lineno

-            import_dir = 'test/runner/.tox/import/'

-            minimal_dir = 'test/runner/.tox/minimal-'

-

             if filepath.startswith('../') or filepath.startswith(minimal_dir):

                 # The warning occurred outside our source tree.

                 # The best we can do is to report the file which was tested that triggered the warning.

@@ -21,6 +21,7 @@ from .util import (

 from .util_common import (

     run_command,

+    ResultType,

 )

 from .config import (

@@ -82,7 +83,7 @@ def ansible_environment(args, color=True, ansible_config=None):

     if args.debug:

         env.update(dict(

             ANSIBLE_DEBUG='true',

-            ANSIBLE_LOG_PATH=os.path.join(data_context().results, 'logs', 'debug.log'),

+            ANSIBLE_LOG_PATH=os.path.join(ResultType.LOGS.name, 'debug.log'),

         ))

     if data_context().content.collection:

@@ -276,7 +276,7 @@ class PathMapper:

             if ext == '.cs':

                 return self.get_csharp_module_utils_usage(path)

-        if path.startswith('test/integration/targets/'):

+        if is_subdir(path, data_context().content.integration_targets_path):

             return self.get_integration_target_usage(path)

         return []

@@ -338,7 +338,8 @@ class PathMapper:

         :rtype: list[str]

         """

         target_name = path.split('/')[3]

-        dependents = [os.path.join('test/integration/targets/%s/' % target) for target in sorted(self.integration_dependencies.get(target_name, set()))]

+        dependents = [os.path.join(data_context().content.integration_targets_path, target) + os.path.sep

+                      for target in sorted(self.integration_dependencies.get(target_name, set()))]

         return dependents

@@ -620,22 +621,10 @@ class PathMapper:

         if path.startswith('test/ansible_test/'):

             return minimal  # these tests are not invoked from ansible-test

-        if path.startswith('test/cache/'):

-            return minimal

-

-        if path.startswith('test/results/'):

-            return minimal

-

         if path.startswith('test/legacy/'):

             return minimal

-        if path.startswith('test/env/'):

-            return minimal

-

-        if path.startswith('test/integration/roles/'):

-            return minimal

-

-        if path.startswith('test/integration/targets/'):

+        if is_subdir(path, data_context().content.integration_targets_path):

             if not os.path.exists(path):

                 return minimal

@@ -655,25 +644,8 @@ class PathMapper:

                 FOCUSED_TARGET: True,

             }

-        if path.startswith('test/integration/'):

-            if dirname == 'test/integration':

-                if self.prefixes.get(name) == 'network' and ext == '.yaml':

-                    return minimal  # network integration test playbooks are not used by ansible-test

-

-                if filename == 'network-all.yaml':

-                    return minimal  # network integration test playbook not used by ansible-test

-

-                if filename == 'platform_agnostic.yaml':

-                    return minimal  # network integration test playbook not used by ansible-test

-

-                if filename.startswith('inventory.') and filename.endswith('.template'):

-                    return minimal  # ansible-test does not use these inventory templates

-

-                if filename == 'inventory':

-                    return {

-                        'integration': self.integration_all_target,

-                    }

-

+        if is_subdir(path, data_context().content.integration_path):

+            if dirname == data_context().content.integration_path:

                 for command in (

                         'integration',

                         'windows-integration',

@@ -888,7 +888,7 @@ def complete_network_testcase(prefix, parsed_args, **_):

     if len(parsed_args.include) != 1:

         return []

-    test_dir = 'test/integration/targets/%s/tests' % parsed_args.include[0]

+    test_dir = os.path.join(data_context().content.integration_targets_path, parsed_args.include[0], 'tests')

     connection_dirs = data_context().content.get_dirs(test_dir)

     for connection_dir in connection_dirs:

@@ -5,7 +5,6 @@ __metaclass__ = type

 import abc

 import atexit

 import datetime

-import json

 import time

 import os

 import platform

@@ -23,10 +22,14 @@ from ..util import (

     load_plugins,

     ABC,

     to_bytes,

-    make_dirs,

     ANSIBLE_TEST_CONFIG_ROOT,

 )

+from ..util_common import (

+    write_json_test_results,

+    ResultType,

+)

+

 from ..target import (

     TestTarget,

 )

@@ -158,17 +161,14 @@ def cloud_init(args, targets):

         )

     if not args.explain and results:

-        results_path = os.path.join(data_context().results, 'data', '%s-%s.json' % (

-            args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.utcnow().replace(microsecond=0)))))

+        result_name = '%s-%s.json' % (

+            args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.utcnow().replace(microsecond=0))))

         data = dict(

             clouds=results,

         )

-        make_dirs(os.path.dirname(results_path))

-

-        with open(results_path, 'w') as results_fd:

-            results_fd.write(json.dumps(data, sort_keys=True, indent=4))

+        write_json_test_results(ResultType.DATA, result_name, data)

 class CloudBase(ABC):

@@ -280,8 +280,6 @@ class CloudBase(ABC):

 class CloudProvider(CloudBase):

     """Base class for cloud provider plugins. Sets up cloud resources before delegation."""

-    TEST_DIR = 'test/integration'

-

     def __init__(self, args, config_extension='.ini'):

         """

         :type args: IntegrationConfig

@@ -291,7 +289,7 @@ class CloudProvider(CloudBase):

         self.remove_config = False

         self.config_static_name = 'cloud-config-%s%s' % (self.platform, config_extension)

-        self.config_static_path = os.path.join(self.TEST_DIR, self.config_static_name)

+        self.config_static_path = os.path.join(data_context().content.integration_path, self.config_static_name)

         self.config_template_path = os.path.join(ANSIBLE_TEST_CONFIG_ROOT, '%s.template' % self.config_static_name)

         self.config_extension = config_extension

@@ -352,8 +350,8 @@ class CloudProvider(CloudBase):

         """

         prefix = '%s-' % os.path.splitext(os.path.basename(self.config_static_path))[0]

-        with tempfile.NamedTemporaryFile(dir=self.TEST_DIR, prefix=prefix, suffix=self.config_extension, delete=False) as config_fd:

-            filename = os.path.join(self.TEST_DIR, os.path.basename(config_fd.name))

+        with tempfile.NamedTemporaryFile(dir=data_context().content.integration_path, prefix=prefix, suffix=self.config_extension, delete=False) as config_fd:

+            filename = os.path.join(data_context().content.integration_path, os.path.basename(config_fd.name))

             self.config_path = filename

             self.remove_config = True

@@ -3,7 +3,6 @@ from __future__ import (absolute_import, division, print_function)

 __metaclass__ = type

 import os

-import time

 from . import (

     CloudProvider,

@@ -14,10 +13,8 @@ from . import (

 from ..util import (

     find_executable,

     display,

-    ApplicationError,

     is_shippable,

     ConfigParser,

-    SubprocessError,

 )

 from ..docker_util import (

@@ -32,10 +29,6 @@ from ..core_ci import (

     AnsibleCoreCI,

 )

-from ..http import (

-    HttpClient,

-)

-

 class VcenterProvider(CloudProvider):

     """VMware vcenter/esx plugin. Sets up cloud resources for tests."""

@@ -14,7 +14,6 @@ from .util import (

     generate_pip_command,

     get_docker_completion,

     ApplicationError,

-    INTEGRATION_DIR_RELATIVE,

 )

 from .util_common import (

@@ -247,7 +246,7 @@ class IntegrationConfig(TestConfig):

     def get_ansible_config(self):  # type: () -> str

         """Return the path to the Ansible config for the given config."""

-        ansible_config_relative_path = os.path.join(INTEGRATION_DIR_RELATIVE, '%s.cfg' % self.command)

+        ansible_config_relative_path = os.path.join(data_context().content.integration_path, '%s.cfg' % self.command)

         ansible_config_path = os.path.join(data_context().content.root, ansible_config_relative_path)

         if not os.path.exists(ansible_config_path):

@@ -327,6 +326,7 @@ class CoverageConfig(EnvironmentConfig):

         self.group_by = frozenset(args.group_by) if 'group_by' in args and args.group_by else set()  # type: t.FrozenSet[str]

         self.all = args.all if 'all' in args else False  # type: bool

         self.stub = args.stub if 'stub' in args else False  # type: bool

+        self.coverage = False  # temporary work-around to support intercept_command in cover.py

 class CoverageReportConfig(CoverageConfig):

@@ -28,6 +28,8 @@ from .util import (

 from .util_common import (

     run_command,

+    write_json_file,

+    ResultType,

 )

 from .config import (

@@ -492,10 +494,7 @@ class AnsibleCoreCI:

         config = self.save()

-        make_dirs(os.path.dirname(self.path))

-

-        with open(self.path, 'w') as instance_fd:

-            instance_fd.write(json.dumps(config, indent=4, sort_keys=True))

+        write_json_file(self.path, config, create_directories=True)

     def save(self):

         """

@@ -559,40 +558,30 @@ class SshKey:

         """

         :type args: EnvironmentConfig

         """

-        cache_dir = os.path.join(data_context().content.root, 'test/cache')

-

-        self.key = os.path.join(cache_dir, self.KEY_NAME)

-        self.pub = os.path.join(cache_dir, self.PUB_NAME)

-

-        key_dst = os.path.relpath(self.key, data_context().content.root)

-        pub_dst = os.path.relpath(self.pub, data_context().content.root)

+        key_pair = self.get_key_pair()

-        if not os.path.isfile(self.key) or not os.path.isfile(self.pub):

-            base_dir = os.path.expanduser('~/.ansible/test/')

+        if not key_pair:

+            key_pair = self.generate_key_pair(args)

-            key = os.path.join(base_dir, self.KEY_NAME)

-            pub = os.path.join(base_dir, self.PUB_NAME)

+        key, pub = key_pair

+        key_dst, pub_dst = self.get_in_tree_key_pair_paths()

-            if not args.explain:

-                make_dirs(base_dir)

-

-            if not os.path.isfile(key) or not os.path.isfile(pub):

-                run_command(args, ['ssh-keygen', '-m', 'PEM', '-q', '-t', 'rsa', '-N', '', '-f', key])

+        def ssh_key_callback(files):  # type: (t.List[t.Tuple[str, str]]) -> None

+            """

+            Add the SSH keys to the payload file list.

+            They are either outside the source tree or in the cache dir which is ignored by default.

+            """

+            if data_context().content.collection:

+                working_path = data_context().content.collection.directory

+            else:

+                working_path = ''

-            self.key = key

-            self.pub = pub

+            files.append((key, os.path.join(working_path, os.path.relpath(key_dst, data_context().content.root))))

+            files.append((pub, os.path.join(working_path, os.path.relpath(pub_dst, data_context().content.root))))

-            def ssh_key_callback(files):  # type: (t.List[t.Tuple[str, str]]) -> None

-                """Add the SSH keys to the payload file list."""

-                if data_context().content.collection:

-                    working_path = data_context().content.collection.directory

-                else:

-                    working_path = ''

+        data_context().register_payload_callback(ssh_key_callback)

-                files.append((key, os.path.join(working_path, key_dst)))

-                files.append((pub, os.path.join(working_path, pub_dst)))

-

-            data_context().register_payload_callback(ssh_key_callback)

+        self.key, self.pub = key, pub

         if args.explain:

             self.pub_contents = None

@@ -600,6 +589,50 @@ class SshKey:

             with open(self.pub, 'r') as pub_fd:

                 self.pub_contents = pub_fd.read().strip()

+    def get_in_tree_key_pair_paths(self):  # type: () -> t.Optional[t.Tuple[str, str]]

+        """Return the ansible-test SSH key pair paths from the content tree."""

+        temp_dir = ResultType.TMP.path

+

+        key = os.path.join(temp_dir, self.KEY_NAME)

+        pub = os.path.join(temp_dir, self.PUB_NAME)

+

+        return key, pub

+

+    def get_source_key_pair_paths(self):  # type: () -> t.Optional[t.Tuple[str, str]]

+        """Return the ansible-test SSH key pair paths for the current user."""

+        base_dir = os.path.expanduser('~/.ansible/test/')

+

+        key = os.path.join(base_dir, self.KEY_NAME)

+        pub = os.path.join(base_dir, self.PUB_NAME)

+

+        return key, pub

+

+    def get_key_pair(self):  # type: () -> t.Optional[t.Tuple[str, str]]

+        """Return the ansible-test SSH key pair paths if present, otherwise return None."""

+        key, pub = self.get_in_tree_key_pair_paths()

+

+        if os.path.isfile(key) and os.path.isfile(pub):

+            return key, pub

+

+        key, pub = self.get_source_key_pair_paths()

+

+        if os.path.isfile(key) and os.path.isfile(pub):

+            return key, pub

+

+        return None

+

+    def generate_key_pair(self, args):  # type: (EnvironmentConfig) -> t.Tuple[str, str]

+        """Generate an SSH key pair for use by all ansible-test invocations for the current user."""

+        key, pub = self.get_source_key_pair_paths()

+

+        if not args.explain:

+            make_dirs(os.path.dirname(key))

+

+        if not os.path.isfile(key) or not os.path.isfile(pub):

+            run_command(args, ['ssh-keygen', '-m', 'PEM', '-q', '-t', 'rsa', '-N', '', '-f', key])

+

+        return key, pub

+

 class InstanceConnection:

     """Container for remote instance status and connection details."""

@@ -18,6 +18,8 @@ from xml.dom import (

     minidom,

 )

+from . import types as t

+

 from .target import (

     walk_module_targets,

     walk_compile_targets,

@@ -34,7 +36,8 @@ from .util import (

 )

 from .util_common import (

-    run_command,

+    intercept_command,

+    ResultType,

 )

 from .config import (

@@ -57,6 +60,7 @@ from .data import (

 COVERAGE_GROUPS = ('command', 'target', 'environment', 'version')

 COVERAGE_CONFIG_PATH = os.path.join(ANSIBLE_TEST_DATA_ROOT, 'coveragerc')

+COVERAGE_OUTPUT_FILE_NAME = 'coverage'

 def command_coverage_combine(args):

@@ -74,9 +78,9 @@ def _command_coverage_combine_python(args):

     """

     coverage = initialize_coverage(args)

-    modules = dict((t.module, t.path) for t in list(walk_module_targets()) if t.path.endswith('.py'))

+    modules = dict((target.module, target.path) for target in list(walk_module_targets()) if target.path.endswith('.py'))

-    coverage_dir = os.path.join(data_context().results, 'coverage')

+    coverage_dir = ResultType.COVERAGE.path

     coverage_files = [os.path.join(coverage_dir, f) for f in os.listdir(coverage_dir)

                       if '=coverage.' in f and '=python' in f]

@@ -140,7 +144,7 @@ def _command_coverage_combine_python(args):

     invalid_path_count = 0

     invalid_path_chars = 0

-    coverage_file = os.path.join(data_context().results, 'coverage', 'coverage')

+    coverage_file = os.path.join(ResultType.COVERAGE.path, COVERAGE_OUTPUT_FILE_NAME)

     for group in sorted(groups):

         arc_data = groups[group]

@@ -322,9 +326,7 @@ def command_coverage_report(args):

             if args.omit:

                 options.extend(['--omit', args.omit])

-            env = common_environment()

-            env.update(dict(COVERAGE_FILE=output_file))

-            run_command(args, env=env, cmd=['coverage', 'report', '--rcfile', COVERAGE_CONFIG_PATH] + options)

+            run_coverage(args, output_file, 'report', options)

 def command_coverage_html(args):

@@ -339,10 +341,10 @@ def command_coverage_html(args):

             display.info("Skipping output file %s in html generation" % output_file, verbosity=3)

             continue

-        dir_name = os.path.join(data_context().results, 'reports', os.path.basename(output_file))

-        env = common_environment()

-        env.update(dict(COVERAGE_FILE=output_file))

-        run_command(args, env=env, cmd=['coverage', 'html', '--rcfile', COVERAGE_CONFIG_PATH, '-i', '-d', dir_name])

+        dir_name = os.path.join(ResultType.REPORTS.path, os.path.basename(output_file))

+        run_coverage(args, output_file, 'html', ['-i', '-d', dir_name])

+

+        display.info('HTML report generated: file:///%s' % os.path.join(dir_name, 'index.html'))

 def command_coverage_xml(args):

@@ -352,7 +354,7 @@ def command_coverage_xml(args):

     output_files = command_coverage_combine(args)

     for output_file in output_files:

-        xml_name = os.path.join(data_context().results, 'reports', '%s.xml' % os.path.basename(output_file))

+        xml_name = os.path.join(ResultType.REPORTS.path, '%s.xml' % os.path.basename(output_file))

         if output_file.endswith('-powershell'):

             report = _generage_powershell_xml(output_file)

@@ -363,9 +365,7 @@ def command_coverage_xml(args):

             with open(xml_name, 'w') as xml_fd:

                 xml_fd.write(pretty)

         else:

-            env = common_environment()

-            env.update(dict(COVERAGE_FILE=output_file))

-            run_command(args, env=env, cmd=['coverage', 'xml', '--rcfile', COVERAGE_CONFIG_PATH, '-i', '-o', xml_name])

+            run_coverage(args, output_file, 'xml', ['-i', '-o', xml_name])

 def command_coverage_erase(args):

@@ -374,7 +374,7 @@ def command_coverage_erase(args):

     """

     initialize_coverage(args)

-    coverage_dir = os.path.join(data_context().results, 'coverage')

+    coverage_dir = ResultType.COVERAGE.path

     for name in os.listdir(coverage_dir):

         if not name.startswith('coverage') and '=coverage.' not in name:

@@ -440,13 +440,13 @@ def _command_coverage_combine_powershell(args):

     :type args: CoverageConfig

     :rtype: list[str]

     """

-    coverage_dir = os.path.join(data_context().results, 'coverage')

+    coverage_dir = ResultType.COVERAGE.path

     coverage_files = [os.path.join(coverage_dir, f) for f in os.listdir(coverage_dir)

                       if '=coverage.' in f and '=powershell' in f]

-    def _default_stub_value(line_count):

+    def _default_stub_value(lines):

         val = {}

-        for line in range(line_count):

+        for line in range(lines):

             val[line] = 0

         return val

@@ -504,7 +504,7 @@ def _command_coverage_combine_powershell(args):

     invalid_path_count = 0

     invalid_path_chars = 0

-    coverage_file = os.path.join(data_context().results, 'coverage', 'coverage')

+    coverage_file = os.path.join(ResultType.COVERAGE.path, COVERAGE_OUTPUT_FILE_NAME)

     for group in sorted(groups):

         coverage_data = groups[group]

@@ -543,7 +543,7 @@ def _command_coverage_combine_powershell(args):

 def _generage_powershell_xml(coverage_file):

     """

-    :type input_path: str

+    :type coverage_file: str

     :rtype: Element

     """

     with open(coverage_file, 'rb') as coverage_fd:

@@ -669,7 +669,7 @@ def _add_cobertura_package(packages, package_name, package_data):

 def _generate_powershell_output_report(args, coverage_file):

     """

-    :type args: CoverageConfig

+    :type args: CoverageReportConfig

     :type coverage_file: str

     :rtype: str

     """

@@ -756,3 +756,13 @@ def _generate_powershell_output_report(args, coverage_file):

     report = '{0}\n{1}\n{2}\n{1}\n{3}'.format(header, line_break, "\n".join(lines), totals)

     return report

+

+

+def run_coverage(args, output_file, command, cmd):  # type: (CoverageConfig, str, str, t.List[str]) -> None

+    """Run the coverage cli tool with the specified options."""

+    env = common_environment()

+    env.update(dict(COVERAGE_FILE=output_file))

+

+    cmd = ['python', '-m', 'coverage', command, '--rcfile', COVERAGE_CONFIG_PATH] + cmd

+

+    intercept_command(args, target_name='coverage', env=env, cmd=cmd, disable_coverage=True)

@@ -17,6 +17,10 @@ from .util import (

     remove_tree,

 )

+from .util_common import (

+    write_text_file,

+)

+

 from .data import (

     data_context,

 )

@@ -45,8 +49,7 @@ def coverage_setup(args):  # type: (TestConfig) -> None

     else:

         args.coverage_config_base_path = tempfile.mkdtemp()

-        with open(os.path.join(args.coverage_config_base_path, COVERAGE_CONFIG_NAME), 'w') as coverage_config_path_fd:

-            coverage_config_path_fd.write(coverage_config)

+        write_text_file(os.path.join(args.coverage_config_base_path, COVERAGE_CONFIG_NAME), coverage_config)

 def coverage_cleanup(args):  # type: (TestConfig) -> None

@@ -81,6 +84,7 @@ omit =

     */pyshared/*

     */pytest

     */AnsiballZ_*.py

+    */test/results/*

 '''

     return coverage_config

@@ -110,7 +114,7 @@ include =

      %s/*

 omit =

-    */test/runner/.tox/*

+    */test/results/*

 ''' % data_context().content.root

     else:

         coverage_config += '''

@@ -72,7 +72,8 @@ class DataContext:

             content = self.__create_content_layout(layout_providers, source_providers, current_path, True)

         self.content = content  # type: ContentLayout

-        self.results = os.path.join(self.content.root, 'test', 'results')

+        self.results_relative = os.path.join('test', 'results')

+        self.results = os.path.join(self.content.root, self.results_relative)

     def create_collection_layouts(self):  # type: () -> t.List[ContentLayout]

         """

@@ -50,6 +50,7 @@ from .util import (

 from .util_common import (

     run_command,

+    ResultType,

 )

 from .docker_util import (

@@ -241,6 +242,8 @@ def delegate_docker(args, exclude, require, integration_targets):

     else:

         content_root = install_root

+    remote_results_root = os.path.join(content_root, data_context().results_relative)

+

     cmd = generate_command(args, python_interpreter, os.path.join(install_root, 'bin'), content_root, options, exclude, require)

     if isinstance(args, TestConfig):

@@ -321,19 +324,12 @@ def delegate_docker(args, exclude, require, integration_targets):

             # also disconnect from the network once requirements have been installed

             if isinstance(args, UnitsConfig):

                 writable_dirs = [

-                    os.path.join(install_root, '.pytest_cache'),

+                    os.path.join(content_root, ResultType.JUNIT.relative_path),

+                    os.path.join(content_root, ResultType.COVERAGE.relative_path),

                 ]

-                if content_root != install_root:

-                    writable_dirs.append(os.path.join(content_root, 'test/results/junit'))

-                    writable_dirs.append(os.path.join(content_root, 'test/results/coverage'))

-

                 docker_exec(args, test_id, ['mkdir', '-p'] + writable_dirs)

                 docker_exec(args, test_id, ['chmod', '777'] + writable_dirs)

-

-                if content_root == install_root:

-                    docker_exec(args, test_id, ['find', os.path.join(content_root, 'test/results/'), '-type', 'd', '-exec', 'chmod', '777', '{}', '+'])

-

                 docker_exec(args, test_id, ['chmod', '755', '/root'])

                 docker_exec(args, test_id, ['chmod', '644', os.path.join(content_root, args.metadata_path)])

@@ -353,10 +349,16 @@ def delegate_docker(args, exclude, require, integration_targets):

             try:

                 docker_exec(args, test_id, cmd, options=cmd_options)

             finally:

+                local_test_root = os.path.dirname(data_context().results)

+

+                remote_test_root = os.path.dirname(remote_results_root)

+                remote_results_name = os.path.basename(remote_results_root)

+                remote_temp_file = os.path.join('/root', remote_results_name + '.tgz')

+

                 with tempfile.NamedTemporaryFile(prefix='ansible-result-', suffix='.tgz') as local_result_fd:

-                    docker_exec(args, test_id, ['tar', 'czf', '/root/results.tgz', '-C', os.path.join(content_root, 'test'), 'results'])

-                    docker_get(args, test_id, '/root/results.tgz', local_result_fd.name)

-                    run_command(args, ['tar', 'oxzf', local_result_fd.name, '-C', 'test'])

+                    docker_exec(args, test_id, ['tar', 'czf', remote_temp_file, '-C', remote_test_root, remote_results_name])

+                    docker_get(args, test_id, remote_temp_file, local_result_fd.name)

+                    run_command(args, ['tar', 'oxzf', local_result_fd.name, '-C', local_test_root])

         finally:

             if httptester_id:

                 docker_rm(args, httptester_id)

@@ -470,8 +472,14 @@ def delegate_remote(args, exclude, require, integration_targets):

                     download = False

             if download and content_root:

-                manage.ssh('rm -rf /tmp/results && cp -a %s/test/results /tmp/results && chmod -R a+r /tmp/results' % content_root)

-                manage.download('/tmp/results', 'test')

+                local_test_root = os.path.dirname(data_context().results)

+

+                remote_results_root = os.path.join(content_root, data_context().results_relative)

+                remote_results_name = os.path.basename(remote_results_root)

+                remote_temp_path = os.path.join('/tmp', remote_results_name)

+

+                manage.ssh('rm -rf {0} && cp -a {1} {0} && chmod -R a+r {0}'.format(remote_temp_path, remote_results_root))

+                manage.download(remote_temp_path, local_test_root)

     finally:

         if args.remote_terminate == 'always' or (args.remote_terminate == 'success' and success):

             core_ci.stop()

@@ -26,6 +26,12 @@ from .util import (

     get_available_python_versions,

 )

+from .util_common import (

+    write_json_test_results,

+    write_json_file,

+    ResultType,

+)

+

 from .git import (

     Git,

 )

@@ -47,10 +53,6 @@ from .test import (

     TestTimeout,

 )

-from .data import (

-    data_context,

-)

-

 from .executor import (

     SUPPORTED_PYTHON_VERSIONS,

 )

@@ -122,8 +124,7 @@ def show_dump_env(args):

         show_dict(data, verbose)

     if args.dump and not args.explain:

-        with open(os.path.join(data_context().results, 'bot', 'data-environment.json'), 'w') as results_fd:

-            results_fd.write(json.dumps(data, sort_keys=True))

+        write_json_test_results(ResultType.BOT, 'data-environment.json', data)

 def set_timeout(args):

@@ -151,8 +152,7 @@ def set_timeout(args):

             deadline=deadline,

         )

-        with open(TIMEOUT_PATH, 'w') as timeout_fd:

-            json.dump(data, timeout_fd, indent=4, sort_keys=True)

+        write_json_file(TIMEOUT_PATH, data)

     elif os.path.exists(TIMEOUT_PATH):

         os.remove(TIMEOUT_PATH)

@@ -56,7 +56,6 @@ from .util import (

     find_python,

     get_docker_completion,

     get_remote_completion,

-    COVERAGE_OUTPUT_NAME,

     cmd_quote,

     ANSIBLE_LIB_ROOT,

     ANSIBLE_TEST_DATA_ROOT,

@@ -71,6 +70,9 @@ from .util_common import (

     intercept_command,

     named_temporary_file,

     run_command,

+    write_text_file,

+    write_json_test_results,

+    ResultType,

 )

 from .docker_util import (

@@ -128,9 +130,7 @@ from .integration import (

     integration_test_environment,

     integration_test_config_file,

     setup_common_temp_dir,

-    INTEGRATION_VARS_FILE_RELATIVE,

     get_inventory_relative_path,

-    INTEGRATION_DIR_RELATIVE,

     check_inventory,

     delegate_inventory,

 )

@@ -198,8 +198,8 @@ def install_command_requirements(args, python_version=None):

     :type python_version: str | None

     """

     if not args.explain:

-        make_dirs(os.path.join(data_context().results, 'coverage'))

-        make_dirs(os.path.join(data_context().results, 'data'))

+        make_dirs(ResultType.COVERAGE.path)

+        make_dirs(ResultType.DATA.path)

     if isinstance(args, ShellConfig):

         if args.raw:

@@ -322,12 +322,9 @@ Author-email: info@ansible.com

 License: GPLv3+

 ''' % get_ansible_version()

-    os.mkdir(egg_info_path)

-

     pkg_info_path = os.path.join(egg_info_path, 'PKG-INFO')

-    with open(pkg_info_path, 'w') as pkg_info_fd:

-        pkg_info_fd.write(pkg_info.lstrip())

+    write_text_file(pkg_info_path, pkg_info.lstrip(), create_directories=True)

 def generate_pip_install(pip, command, packages=None):

@@ -394,7 +391,7 @@ def command_network_integration(args):

     template_path = os.path.join(ANSIBLE_TEST_CONFIG_ROOT, os.path.basename(inventory_relative_path)) + '.template'

     if args.inventory:

-        inventory_path = os.path.join(data_context().content.root, INTEGRATION_DIR_RELATIVE, args.inventory)

+        inventory_path = os.path.join(data_context().content.root, data_context().content.integration_path, args.inventory)

     else:

         inventory_path = os.path.join(data_context().content.root, inventory_relative_path)

@@ -445,8 +442,7 @@ def command_network_integration(args):

         display.info('>>> Inventory: %s\n%s' % (inventory_path, inventory.strip()), verbosity=3)

         if not args.explain:

-            with open(inventory_path, 'w') as inventory_fd:

-                inventory_fd.write(inventory)

+            write_text_file(inventory_path, inventory)

     success = False

@@ -576,7 +572,7 @@ def command_windows_integration(args):

     template_path = os.path.join(ANSIBLE_TEST_CONFIG_ROOT, os.path.basename(inventory_relative_path)) + '.template'

     if args.inventory:

-        inventory_path = os.path.join(data_context().content.root, INTEGRATION_DIR_RELATIVE, args.inventory)

+        inventory_path = os.path.join(data_context().content.root, data_context().content.integration_path, args.inventory)

     else:

         inventory_path = os.path.join(data_context().content.root, inventory_relative_path)

@@ -620,8 +616,7 @@ def command_windows_integration(args):

         display.info('>>> Inventory: %s\n%s' % (inventory_path, inventory.strip()), verbosity=3)

         if not args.explain:

-            with open(inventory_path, 'w') as inventory_fd:

-                inventory_fd.write(inventory)

+            write_text_file(inventory_path, inventory)

         use_httptester = args.httptester and any('needs/httptester/' in target.aliases for target in internal_targets)

         # if running under Docker delegation, the httptester may have already been started

@@ -681,9 +676,9 @@ def command_windows_integration(args):

             pre_target = forward_ssh_ports

             post_target = cleanup_ssh_ports

-    def run_playbook(playbook, playbook_vars):

+    def run_playbook(playbook, run_playbook_vars):  # type: (str, t.Dict[str, t.Any]) -> None

         playbook_path = os.path.join(ANSIBLE_TEST_DATA_ROOT, 'playbooks', playbook)

-        command = ['ansible-playbook', '-i', inventory_path, playbook_path, '-e', json.dumps(playbook_vars)]

+        command = ['ansible-playbook', '-i', inventory_path, playbook_path, '-e', json.dumps(run_playbook_vars)]

         if args.verbosity:

             command.append('-%s' % ('v' * args.verbosity))

@@ -716,7 +711,7 @@ def command_windows_integration(args):

                 for filename in os.listdir(local_temp_path):

                     with open_zipfile(os.path.join(local_temp_path, filename)) as coverage_zip:

-                        coverage_zip.extractall(os.path.join(data_context().results, 'coverage'))

+                        coverage_zip.extractall(ResultType.COVERAGE.path)

         if args.remote_terminate == 'always' or (args.remote_terminate == 'success' and success):

             for instance in instances:

@@ -882,7 +877,7 @@ def command_integration_filter(args,  # type: TIntegrationConfig

     cloud_init(args, internal_targets)

-    vars_file_src = os.path.join(data_context().content.root, INTEGRATION_VARS_FILE_RELATIVE)

+    vars_file_src = os.path.join(data_context().content.root, data_context().content.integration_vars_path)

     if os.path.exists(vars_file_src):

         def integration_config_callback(files):  # type: (t.List[t.Tuple[str, str]]) -> None

@@ -895,7 +890,7 @@ def command_integration_filter(args,  # type: TIntegrationConfig

             else:

                 working_path = ''

-            files.append((vars_file_src, os.path.join(working_path, INTEGRATION_VARS_FILE_RELATIVE)))

+            files.append((vars_file_src, os.path.join(working_path, data_context().content.integration_vars_path)))

         data_context().register_payload_callback(integration_config_callback)

@@ -1086,23 +1081,22 @@ def command_integration_filtered(args, targets, all_targets, inventory_path, pre

     finally:

         if not args.explain:

             if args.coverage:

-                coverage_temp_path = os.path.join(common_temp_path, COVERAGE_OUTPUT_NAME)

-                coverage_save_path = os.path.join(data_context().results, 'coverage')

+                coverage_temp_path = os.path.join(common_temp_path, ResultType.COVERAGE.name)

+                coverage_save_path = ResultType.COVERAGE.path

                 for filename in os.listdir(coverage_temp_path):

                     shutil.copy(os.path.join(coverage_temp_path, filename), os.path.join(coverage_save_path, filename))

             remove_tree(common_temp_path)

-            results_path = os.path.join(data_context().results, 'data', '%s-%s.json' % (