suite: Check for containers for cephadm jobs

As opposed to always

Signed-off-by: Zack Cerza <zack@cerza.org>

Author: zmc

teuthology/suite/run.py

@@ -549,6 +549,15 @@ def collect_jobs(self, arch, configs, newest=False, limit=0):
                     # no point in continuing the search
                     if newest:
                         return jobs_missing_packages, []
+                job_tasks = set()
+                for task_dict in parsed_yaml.get('tasks', []):
+                    for key in task_dict.keys():
+                        job_tasks.add(key)
+                if any(['cephadm' in name for name in job_tasks]):
+                    if not util.container_image_for_hash(sha1):
+                        jobs_missing_packages.append(job)
+                        if newest:
+                            return jobs_missing_packages, []
 
             jobs_to_schedule.append(job)
         return jobs_missing_packages, jobs_to_schedule

teuthology/suite/util.py

@@ -243,10 +243,6 @@ def package_version_for_hash(hash, flavor='default', distro='rhel',
         ),
     )
 
-    if not container_image_for_hash(hash):
-        log.info("Container build incomplete")
-        return None
-
     try:
         return bp.version
     except VersionNotFoundError:

teuthology/util/containers.py

@@ -1,3 +1,4 @@
+import functools
 import logging
 import re
 import requests
@@ -44,6 +45,7 @@ def resolve_container_image(image: str):
     return f"{domain}/{org}/{image}:{tag}"
 
 
+@functools.lru_cache()
 def container_image_exists(image: str):
     """
     Use the Quay API to check for the existence of a container image.
@@ -53,7 +55,7 @@ def container_image_exists(image: str):
     assert match
     obj = match.groupdict()
     url = f"https://{obj['domain']}/api/v1/repository/{obj['org']}/{obj['image']}/tag?filter_tag_name=eq:{obj['tag']}"
-    log.debug(f"Checking for container existence at: {url}")
+    log.info(f"Checking for container existence at: {url}")
     resp = requests.get(url)
     return resp.ok and len(resp.json().get('tags')) >= 1
 
@@ -70,3 +72,5 @@ def container_image_for_hash(hash: str, flavor='default', base_image='centos:9')
     image_spec = resolve_container_image(f":{tag}")
     if container_image_exists(image_spec):
         return image_spec
+    else:
+        log.error(f"Container image not found for hash '{hash}'")