Merge pull request #170 from JenySadadia/validate-builds-cmd

Implement command to validate builds

Author: aliceinwire

kcidev/libs/common.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+import json
 import logging
 import os
 import sys
@@ -128,17 +129,21 @@ def kci_msg_nonl(content):
     click.echo(content, nl=False)
 
 
-def kci_msg_green_nonl(content):
-    click.secho(content, fg="green", nl=False)
+def kci_msg_green(content, nl=True):
+    click.secho(content, fg="green", nl=nl)
 
 
-def kci_msg_red_nonl(content):
-    click.secho(content, fg="red", nl=False)
+def kci_msg_red(content, nl=True):
+    click.secho(content, fg="red", nl=nl)
 
 
-def kci_msg_yellow_nonl(content):
-    click.secho(content, fg="bright_yellow", nl=False)
+def kci_msg_yellow(content, nl=True):
+    click.secho(content, fg="bright_yellow", nl=nl)
 
 
-def kci_msg_cyan_nonl(content):
-    click.secho(content, fg="cyan", nl=False)
+def kci_msg_cyan(content, nl=True):
+    click.secho(content, fg="cyan", nl=nl)
+
+
+def kci_msg_json(content, indent=1):
+    click.echo(json.dumps(content, indent=indent))

kcidev/libs/git_repo.py

@@ -402,11 +402,11 @@ def set_giturl_branch_commit(origin, giturl, branch, commit, latest, git_folder)
     logging.info(
         f"Final parameters - URL: {giturl}, Branch: {branch}, Commit: {commit if commit else 'latest'}"
     )
-    kci_msg("git folder: " + str(git_folder))
-    kci_msg("tree: " + giturl)
-    kci_msg("branch: " + branch)
+    logging.info("git folder: " + str(git_folder))
+    logging.info("tree: " + giturl)
+    logging.info("branch: " + branch)
     if commit:
-        kci_msg("commit: " + commit)
+        logging.info("commit: " + commit)
         # If commit looks like a tag or short hash (not 40 chars), try to resolve it
         if len(commit) != 40 or not all(
             c in "0123456789abcdef" for c in commit.lower()
@@ -423,6 +423,20 @@ def set_giturl_branch_commit(origin, giturl, branch, commit, latest, git_folder)
     if latest:
         logging.info("Fetching latest commit from dashboard")
         commit = get_latest_commit(origin, giturl, branch)
-        kci_msg("commit: " + commit)
+        logging.info("commit: " + commit)
 
     return giturl, branch, commit
+
+
+def get_tree_name(origin, giturl, branch, commit):
+    """Get tree name from git URL, branch, and commit"""
+    trees = dashboard_fetch_tree_list(origin, False)
+
+    for t in trees:
+        if (
+            t["git_repository_url"] == giturl
+            and t["git_repository_branch"] == branch
+            and t["git_commit_hash"] == commit
+        ):
+            return t["tree_name"]
+    return None

kcidev/libs/maestro_common.py

@@ -80,20 +80,29 @@ def maestro_get_node(url, nodeid):
     return node_data
 
 
-def maestro_get_nodes(url, limit, offset, filter):
+def maestro_get_nodes(url, limit, offset, filter, paginate):
     headers = {
         "Content-Type": "application/json; charset=utf-8",
     }
-    url = url + "latest/nodes/fast?limit=" + str(limit) + "&offset=" + str(offset)
 
-    logging.info(f"Fetching Maestro nodes - limit: {limit}, offset: {offset}")
-    if filter:
-        logging.debug(f"Applying filters: {filter}")
-        for f in filter:
-            # TBD: We need to add translate filter to API
-            # if we need anything more complex than eq(=)
-            url = url + "&" + f
+    if paginate:
+        url = url + "latest/nodes/fast?limit=" + str(limit) + "&offset=" + str(offset)
+        logging.info(f"Fetching Maestro nodes - limit: {limit}, offset: {offset}")
+        if filter:
+            for f in filter:
+                logging.debug(f"Applying filters: {filter}")
+                # TBD: We need to add translate filter to API
+                # if we need anything more complex than eq(=)
+                url = url + "&" + f
 
+    else:
+        url = url + "latest/nodes/fast"
+        if filter:
+            url = url + "?"
+            for f in filter:
+                # TBD: We need to add translate filter to API
+                # if we need anything more complex than eq(=)
+                url = url + "&" + f
     logging.debug(f"Full nodes URL: {url}")
     maestro_print_api_call(url)
 
@@ -190,18 +199,18 @@ def maestro_node_result(node):
             or result == "done"
             or result == "pass"
         ):
-            kci_msg_green_nonl("PASS")
+            kci_msg_green("PASS", nl=False)
         elif result == None:
-            kci_msg_green_nonl("PASS")
+            kci_msg_green("PASS", nl=False)
         else:
-            kci_msg_red_nonl("FAIL")
+            kci_msg_red("FAIL", nl=False)
     else:
         if node["result"] == "pass":
-            kci_msg_green_nonl("PASS")
+            kci_msg_green("PASS", nl=False)
         elif node["result"] == "fail":
-            kci_msg_red_nonl("FAIL")
+            kci_msg_red("FAIL", nl=False)
         else:
-            kci_msg_yellow_nonl(node["result"])
+            kci_msg_yellow(node["result"])
 
     if node["kind"] == "checkout":
         kci_msg_nonl(" branch checkout")

kcidev/main.py

@@ -14,6 +14,7 @@
     maestro,
     results,
     testretry,
+    validate,
     watch,
 )
 
@@ -63,6 +64,7 @@ def run():
     cli.add_command(maestro.maestro)
     cli.add_command(testretry.testretry)
     cli.add_command(results.results)
+    cli.add_command(validate.validate)
     cli.add_command(watch.watch)
     cli()
 

kcidev/subcommands/maestro/results.py

@@ -67,6 +67,19 @@
     required=False,
     help="Filter results by tree name",
 )
+@click.option(
+    "--count",
+    is_flag=True,
+    required=False,
+    help="Print only count of nodes",
+)
+@click.option(
+    "--paginate",
+    is_flag=True,
+    required=False,
+    default=True,
+    help="Set True if pagination is required in the output. Default is True",
+)
 @add_filter_options
 @click.pass_context
 def results(
@@ -84,6 +97,8 @@ def results(
     compiler,
     config,
     git_branch,
+    count,
+    paginate,
 ):
     logging.info("Starting maestro results command")
     logging.debug(
@@ -127,9 +142,12 @@ def results(
         logging.info(
             f"Fetching nodes with {len(filter)} filters, limit: {limit}, offset: {offset}"
         )
-        results = maestro_get_nodes(url, limit, offset, filter)
+        results = maestro_get_nodes(url, limit, offset, filter, paginate)
+        if count:
+            return results
 
     logging.debug(f"Displaying results with fields: {field if field else 'all'}")
+
     maestro_print_nodes(results, field)
 
 

kcidev/subcommands/results/__init__.py

@@ -98,15 +98,27 @@ def summary(origin, git_folder, giturl, branch, commit, latest, arch, tree, use_
     type=int,
     default=7,
 )
+@click.option(
+    "--verbose",
+    is_flag=True,
+    default=True,
+    help="Print tree details",
+)
 @results_display_options
-def trees(origin, use_json, days):
+def trees(origin, use_json, days, verbose):
     """List trees from a give origin."""
-    cmd_list_trees(origin, use_json, days)
+    return cmd_list_trees(origin, use_json, days, verbose)
 
 
 @results.command()
 @common_options
 @builds_and_tests_options
+@click.option(
+    "--verbose",
+    is_flag=True,
+    default=True,
+    help="Print build details",
+)
 def builds(
     origin,
     git_folder,
@@ -131,6 +143,7 @@ def builds(
     compatible,
     min_duration,
     max_duration,
+    verbose,
 ):
     """Display build results."""
     giturl, branch, commit = set_giturl_branch_commit(
@@ -139,7 +152,7 @@ def builds(
     data = dashboard_fetch_builds(
         origin, giturl, branch, commit, arch, tree, start_date, end_date, use_json
     )
-    cmd_builds(
+    return cmd_builds(
         data,
         commit,
         download_logs,
@@ -149,6 +162,7 @@ def builds(
         git_branch,
         count,
         use_json,
+        verbose,
     )