From 19f6fc68d4c44869e266f97c8667d13971f1d5d9 Mon Sep 17 00:00:00 2001
From: Matt Clay <mclay@redhat.com>
Date: Wed, 19 Feb 2020 09:55:34 -0800
Subject: [PATCH] Relocate Shippable tools. (#67556)

* Move Shippable tools to hacking directory.

These limits the `test/utils/shippable/` directory to scripts required for CI.

* Fix `test/utils/shippable/` file classification.

* Update package-data sanity test.
---
 .../shippable/tools => hacking/shippable}/download.py      | 0
 {test/utils/shippable/tools => hacking/shippable}/run.py   | 0
 test/lib/ansible_test/_internal/classification.py          | 7 +------
 test/sanity/code-smell/package-data.py                     | 1 +
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename {test/utils/shippable/tools => hacking/shippable}/download.py (100%)
 rename {test/utils/shippable/tools => hacking/shippable}/run.py (100%)

diff --git a/test/utils/shippable/tools/download.py b/hacking/shippable/download.py
similarity index 100%
rename from test/utils/shippable/tools/download.py
rename to hacking/shippable/download.py
diff --git a/test/utils/shippable/tools/run.py b/hacking/shippable/run.py
similarity index 100%
rename from test/utils/shippable/tools/run.py
rename to hacking/shippable/run.py
diff --git a/test/lib/ansible_test/_internal/classification.py b/test/lib/ansible_test/_internal/classification.py
index d1a068a60e2..b19f2a88180 100644
--- a/test/lib/ansible_test/_internal/classification.py
+++ b/test/lib/ansible_test/_internal/classification.py
@@ -809,18 +809,13 @@ class PathMapper:
         if path.startswith('test/lib/'):
             return all_tests(self.args)  # test infrastructure, run all tests
 
-        if path.startswith('test/utils/shippable/tools/'):
-            return minimal  # not used by tests
-
         if path.startswith('test/utils/shippable/'):
             if dirname == 'test/utils/shippable':
                 test_map = {
                     'cloud.sh': 'integration:cloud/',
-                    'freebsd.sh': 'integration:all',
                     'linux.sh': 'integration:all',
                     'network.sh': 'network-integration:all',
-                    'osx.sh': 'integration:all',
-                    'rhel.sh': 'integration:all',
+                    'remote.sh': 'integration:all',
                     'sanity.sh': 'sanity:all',
                     'units.sh': 'units:all',
                     'windows.sh': 'windows-integration:all',
diff --git a/test/sanity/code-smell/package-data.py b/test/sanity/code-smell/package-data.py
index d3a4d7a8111..c67fff9696a 100755
--- a/test/sanity/code-smell/package-data.py
+++ b/test/sanity/code-smell/package-data.py
@@ -26,6 +26,7 @@ def assemble_files_to_ship(complete_file_list):
         'changelogs/fragments/*',
         'hacking/aws_config/*',
         'hacking/aws_config/*/*',
+        'hacking/shippable/*',
         'hacking/tests/*',
         'hacking/ticket_stubs/*',
         'test/legacy/*',