It's a leftover from development. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/util.py b/ci/util.py index 90d58454be..304d0d4af8 100644 --- a/ci/util.py +++ b/ci/util.py @@ -12,7 +12,6 @@ def get_registry_uri(namespace: str, :param namespace: GitLab project namespace, e.g. "libvirt/libvirt" :param gitlab_uri: GitLab base URI, can be a private deployment - :param api_version: GitLab REST API version number :return: URI pointing to a namespaced project's image registry """ -- 2.26.3

This is a more flexible function that parses the name of the container image into its components: distro name and, where applicable, target architecture for cross-building. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/util.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/ci/util.py b/ci/util.py index 304d0d4af8..e4e0955098 100644 --- a/ci/util.py +++ b/ci/util.py @@ -39,24 +39,32 @@ def get_registry_images(uri: str) -> List[Dict]: return json.loads(r.read().decode()) -def get_image_distro(image_name: str) -> str: +def get_image_info(image_name: str) -> Dict[str, str]: """ - Extract the name of the distro in the GitLab image registry name, e.g. - ci-debian-9-cross-mipsel --> debian-9 + Extract information about the image from its name, e.g. + + "ci-debian-9-cross-mipsel" + => { "distro": "debian-9", "cross": "mipsel" } + + "ci-centos-8" + => { "distro": "centos-8", "cross": None } :param image_name: name of the GitLab registry image - :return: distro name as a string + :return: image information """ - name_prefix = "ci-" - name_suffix = "-cross-" + distro_prefix = "ci-" + cross_prefix = "-cross-" - distro = image_name[len(name_prefix):] + distro = image_name[len(distro_prefix):] - index = distro.find(name_suffix) - if index > 0: - distro = distro[:index] + cross_index = distro.find(cross_prefix) + if cross_index > 0: + cross = distro[cross_index + len(cross_prefix):] + distro = distro[:cross_index] + else: + cross = None - return distro + return {"distro": distro, "cross": cross} def get_registry_stale_images(registry_uri: str, @@ -74,7 +82,8 @@ def get_registry_stale_images(registry_uri: str, stale_images = {} for img in images: - if get_image_distro(img["name"]) not in supported_distros: + info = get_image_info(img["name"]) + if info["distro"] not in supported_distros: stale_images[img["name"]] = img["id"] return stale_images -- 2.26.3

The current documentation makes it sound like the function will only return a simple list containing the name of each image available on the registry, but it actually returns a lot more information than that. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/util.py b/ci/util.py index e4e0955098..625428f339 100644 --- a/ci/util.py +++ b/ci/util.py @@ -29,8 +29,13 @@ def get_registry_images(uri: str) -> List[Dict]: List all container images that are currently available in the given GitLab project. + The raw data, as obtained from the GitLab API, is returned: this + will contain not only the name of each image, but also additional + information such as the image ID, which can be used to perform + further operations with subsequent calls to the GitLab API. + :param uri: URI pointing to a GitLab instance's image registry - :return: list of container image names + :return: detailed information about container images """ r = urllib.request.urlopen(uri + "?per_page=100") -- 2.26.3

This stresses the fact that the function returns the data obtained from the GitLab API in its raw form; later on, we're going to implement a more convenient wrapper that extracts the information we're interested in and processes it so that it can be used more conveniently. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/helper | 2 +- ci/util.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/helper b/ci/helper index 2c3a9f8db4..eb037d3495 100755 --- a/ci/helper +++ b/ci/helper @@ -309,7 +309,7 @@ class Application: def _action_list_images(self): registry_uri = util.get_registry_uri(self._args.namespace, self._args.gitlab_uri) - images = util.get_registry_images(registry_uri) + images = util.get_registry_images_raw(registry_uri) # skip the "ci-" prefix each of our container images' name has name_prefix = "ci-" diff --git a/ci/util.py b/ci/util.py index 625428f339..b6a99ce9c0 100644 --- a/ci/util.py +++ b/ci/util.py @@ -24,7 +24,7 @@ def get_registry_uri(namespace: str, return uri -def get_registry_images(uri: str) -> List[Dict]: +def get_registry_images_raw(uri: str) -> List[Dict]: """ List all container images that are currently available in the given GitLab project. @@ -83,7 +83,7 @@ def get_registry_stale_images(registry_uri: str, :return: dictionary formatted as: {<gitlab_image_name>: <gitlab_image_id>} """ - images = get_registry_images(registry_uri) + images = get_registry_images_raw(registry_uri) stale_images = {} for img in images: -- 2.26.3

Generate output using the processed data instead of the raw data. The output remains identical for now, so this doesn't look like a big improvement, but we're soon going to change it in a way that highlights the convenience of using processed data. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/helper | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ci/helper b/ci/helper index eb037d3495..c1e1a53d51 100755 --- a/ci/helper +++ b/ci/helper @@ -309,15 +309,18 @@ class Application: def _action_list_images(self): registry_uri = util.get_registry_uri(self._args.namespace, self._args.gitlab_uri) - images = util.get_registry_images_raw(registry_uri) - - # skip the "ci-" prefix each of our container images' name has - name_prefix = "ci-" - names = [i["name"][len(name_prefix):] for i in images] - names.sort() - - native = [name for name in names if "-cross-" not in name] - cross = [name for name in names if "-cross-" in name] + images = util.get_registry_images(registry_uri) + + native = [] + cross = [] + for image_distro in images.keys(): + if images[image_distro]: + for image_cross in images[image_distro]: + cross.append(image_distro + "-cross-" + image_cross) + else: + native.append(image_distro) + native.sort() + cross.sort() spacing = 4 * " " print("Available x86 container images:\n") -- 2.26.3

This provides a single place where we can process self._args before handing the control over to make; later on, we're going to implement more logic that can be shared by the build, test and shell actions. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/helper | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/helper b/ci/helper index 6543a47131..31e05c0e38 100755 --- a/ci/helper +++ b/ci/helper @@ -186,6 +186,11 @@ class Application: if pty.spawn(["make"] + args) != 0: sys.exit("error: 'make' failed") + def _make_run_action(self, action): + target = self._args.target + make_target = f"{action}@{target}" + self._make_run(make_target) + def _lcitool_run(self, args): output = subprocess.check_output([self._args.lcitool] + args) return output.decode("utf-8") @@ -298,13 +303,13 @@ class Application: print(msg.replace("STALE_DETAILS", stale_details)) def _action_build(self): - self._make_run(f"ci-build@{self._args.target}") + self._make_run_action("ci-build") def _action_test(self): - self._make_run(f"ci-test@{self._args.target}") + self._make_run_action("ci-test") def _action_shell(self): - self._make_run(f"ci-shell@{self._args.target}") + self._make_run_action("ci-shell") def _action_list_images(self): registry_uri = util.get_registry_uri(self._args.namespace, -- 2.26.3

This argument is accepted by all actions that use containers. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/helper | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/helper b/ci/helper index 31e05c0e38..e39934d357 100755 --- a/ci/helper +++ b/ci/helper @@ -23,6 +23,10 @@ class Parser: "target", help="perform action on target OS", ) + containerparser.add_argument( + "-x", "--cross-arch", + help="target architecture for cross-compiler", + ) containerparser.add_argument( "--engine", choices=["auto", "podman", "docker"], @@ -188,7 +192,13 @@ class Application: def _make_run_action(self, action): target = self._args.target - make_target = f"{action}@{target}" + cross = self._args.cross_arch + + if cross: + make_target = f"{action}@{target}-cross-{cross}" + else: + make_target = f"{action}@{target}" + self._make_run(make_target) def _lcitool_run(self, args): -- 2.26.3

This reports a nice error messages when the user attempts to perform a cross-build on a target that doesn't support it, or to use a target that doesn't exist at all. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/helper | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/helper b/ci/helper index cd3069a89a..d5bdb15112 100755 --- a/ci/helper +++ b/ci/helper @@ -191,10 +191,19 @@ class Application: sys.exit("error: 'make' failed") def _make_run_action(self, action): + registry_uri = util.get_registry_uri(self._args.namespace, + self._args.gitlab_uri) + images = util.get_registry_images(registry_uri) target = self._args.target cross = self._args.cross_arch + if target not in images: + sys.exit(f"Unknown target '{target}'") + if cross: + if cross not in images[target]: + sys.exit(f"Target '{target}' doesn't support cross '{cross}'") + make_target = f"{action}@{target}-cross-{cross}" else: make_target = f"{action}@{target}" -- 2.26.3