testmap: move testmap to lib/

This file gets used exactly once from task/, exactly once from machine/
and a whole lot from the various scripts.  It's the perfect candidate
for lib/!

image-download

@@ -47,7 +47,7 @@ from lib.constants import IMAGES_DIR
 from lib.directories import get_images_data_dir
 from lib.stores import PUBLIC_STORES, REDHAT_STORES, CA_PEM
 
-from task.testmap import get_test_image
+from lib.testmap import get_test_image
 
 CONFIG = "~/.config/image-stores"
 

image-refresh

@@ -22,9 +22,10 @@ import subprocess
 import sys
 
 import task
-from task import github, testmap
+from task import github
 
 from lib.constants import BOTS_DIR
+from lib import testmap
 
 
 sys.dont_write_bytecode = True

machine/testvm.py

@@ -35,7 +35,7 @@
 from lib.constants import BOTS_DIR, TEST_DIR, IMAGES_DIR, SCRIPTS_DIR, DEFAULT_IMAGE, TEST_OS_DEFAULT
 from lib.directories import get_images_data_dir
 from machine_core.cli import cmd_cli
-from task.testmap import get_build_image, get_test_image
+from lib.testmap import get_build_image, get_test_image
 
 
 __all__ = [

po-refresh

@@ -26,8 +26,9 @@ import sys
 sys.dont_write_bytecode = True
 
 import task
-from task import github, testmap
+from task import github
 from lib.constants import BASE_DIR
+from lib import testmap
 
 
 def run(context, verbose=False, **kwargs):

store-tests

@@ -28,7 +28,8 @@ import re
 from datetime import datetime
 
 from lib.stores import CA_PEM
-from task import github, testmap
+from lib import testmap
+from task import github
 
 # Result line has form like:
 # ok 2 test/verify/check-accounts TestAccounts.testExpire [ND@1]

task/github.py

@@ -29,7 +29,7 @@
 import subprocess
 import re
 
-from task.testmap import known_context
+from lib.testmap import known_context
 from . import cache
 
 __all__ = (

tests-policy

@@ -32,7 +32,7 @@ FLAKE_THRESHOLD = 0.4
 
 from task import github
 from lib.constants import BOTS_DIR
-from task.testmap import get_test_image
+from lib.testmap import get_test_image
 
 
 def main():

tests-scan

@@ -28,7 +28,8 @@ sys.dont_write_bytecode = True
 logging.basicConfig(level=logging.INFO)
 
 from lib.stores import redhat_network
-from task import github, labels_of_pull, distributed_queue, testmap
+from task import github, labels_of_pull, distributed_queue
+from lib import testmap
 
 no_amqp = False
 try:

tests-trigger

@@ -5,7 +5,8 @@ import sys
 
 sys.dont_write_bytecode = True
 
-from task import github, testmap
+from lib import testmap
+from task import github
 
 
 def trigger_pull(api, opts):