tft-cli 0.0.25__tar.gz → 0.0.26__tar.gz

{tft_cli-0.0.25 → tft_cli-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tft-cli
-Version: 0.0.25
+Version: 0.0.26
 Summary: Testing Farm CLI tool
 License: Apache-2.0
 Author: Miroslav Vadkerti

{tft_cli-0.0.25 → tft_cli-0.0.26}/pyproject.toml

@@ -1,6 +1,10 @@
+[project]
+dynamic = ["version"]
+name = "tft-cli"
+
 [tool.poetry]
 name = "tft-cli"
-version = "0.0.25"
+version = "0.0.26"
 description = "Testing Farm CLI tool"
 authors = ["Miroslav Vadkerti <mvadkert@redhat.com>"]
 license = "Apache-2.0"
@@ -43,6 +47,9 @@ skip-string-normalization = true
 profile = "black"
 multi_line_output = 3
 
+[tool.poetry-dynamic-versioning]
+enable = false
+
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"

{tft_cli-0.0.25 → tft_cli-0.0.26}/src/tft/cli/commands.py

@@ -3,6 +3,7 @@
 
 import base64
 import codecs
+import importlib.metadata
 import ipaddress
 import json
 import os
@@ -17,7 +18,6 @@ import xml.etree.ElementTree as ET
 from enum import Enum
 from typing import Any, Dict, List, Optional
 
-import pkg_resources
 import requests
 import typer
 from click.core import ParameterSource  # pyre-ignore[21]
@@ -41,7 +41,7 @@ from tft.cli.utils import (
     uuid_valid,
 )
 
-cli_version: str = pkg_resources.get_distribution("tft-cli").version
+cli_version: str = importlib.metadata.version("tft-cli")
 
 TestingFarmRequestV1: Dict[str, Any] = {'test': {}, 'environments': None}
 Environment: Dict[str, Any] = {'arch': None, 'os': None, 'pool': None, 'artifacts': None, 'variables': {}}
@@ -271,6 +271,13 @@ OPTION_RESERVE: bool = typer.Option(
     help="Reserve machine after testing, similarly to the `reserve` command.",
     rich_help_panel=REQUEST_PANEL_RESERVE,
 )
+OPTION_TMT_CONTEXT: Optional[List[str]] = typer.Option(
+    None,
+    "-c",
+    "--context",
+    metavar="key=value|@file",
+    help="Context variables to pass to `tmt`. The @ prefix marks a yaml file to load.",
+)
 
 
 def _option_autoconnect(panel: str) -> bool:
@@ -761,7 +768,7 @@ def watch(
                 _handle_reservation(session, api_url, request["id"], autoconnect)
                 return
 
-            time.sleep(1)
+            time.sleep(settings.WATCH_TICK)
             continue
 
         current_state = state
@@ -861,13 +868,7 @@ def request(
     hardware: List[str] = OPTION_HARDWARE,
     kickstart: Optional[List[str]] = OPTION_KICKSTART,
     pool: Optional[str] = OPTION_POOL,
-    cli_tmt_context: Optional[List[str]] = typer.Option(
-        None,
-        "-c",
-        "--context",
-        metavar="key=value|@file",
-        help="Context variables to pass to `tmt`. The @ prefix marks a yaml file to load.",
-    ),
+    cli_tmt_context: Optional[List[str]] = OPTION_TMT_CONTEXT,
     variables: Optional[List[str]] = OPTION_VARIABLES,
     secrets: Optional[List[str]] = OPTION_SECRETS,
     tmt_environment: Optional[List[str]] = typer.Option(
@@ -1254,6 +1255,8 @@ def restart(
         None,
         help="Force pool to provision.",
     ),
+    cli_tmt_context: Optional[List[str]] = OPTION_TMT_CONTEXT,
+    variables: Optional[List[str]] = OPTION_VARIABLES,
     git_url: Optional[str] = typer.Option(None, help="Force URL of the GIT repository to test."),
     git_ref: Optional[str] = typer.Option(None, help="Force GIT ref or branch to test."),
     git_merge_sha: Optional[str] = typer.Option(None, help="Force GIT ref or branch into which --ref will be merged."),
@@ -1332,9 +1335,9 @@ def restart(
     # Transform to a request
     request['environments'] = request['environments_requested']
 
-    # Remove all keys except test and environments
+    # Remove all keys except test, environments and settings
     for key in list(request):
-        if key not in ['test', 'environments']:
+        if key not in ['test', 'environments', 'settings']:
             del request[key]
 
     test = request['test']
@@ -1406,6 +1409,14 @@ def restart(
         for environment in request["environments"]:
             environment["tmt"]["extra_args"]["finish"] = tmt_finish
 
+    if cli_tmt_context:
+        for environment in request["environments"]:
+            environment["tmt"]["context"] = options_to_dict("tmt context", cli_tmt_context)
+
+    if variables:
+        for environment in request["environments"]:
+            environment["variables"] = options_to_dict("environment variables", variables)
+
     test_type = "fmf" if "fmf" in request["test"] else "sti"
 
     if tmt_plan_name:
@@ -1630,7 +1641,7 @@ def run(
             state = request["state"]
 
             if state == current_state:
-                time.sleep(1)
+                time.sleep(settings.WATCH_TICK)
                 continue
 
             current_state = state
@@ -1642,7 +1653,7 @@ def run(
                 progress.stop()
                 exit_error("Request canceled.")
 
-            time.sleep(1)
+            time.sleep(settings.WATCH_TICK)
 
         # workaround TFT-1690
         install_http_retries(session, status_forcelist_extend=[404], timeout=60, retry_backoff_factor=0.1)
@@ -1933,7 +1944,7 @@ def reserve(
             state = request["state"]
 
             if state == current_state:
-                time.sleep(1)
+                time.sleep(settings.WATCH_TICK)
                 continue
 
             current_state = state
@@ -1948,7 +1959,7 @@ def reserve(
             if not print_only_request_id and task_id is not None:
                 progress.update(task_id, description=f"Reservation job is [yellow]{current_state}[/yellow]")
 
-            time.sleep(1)
+            time.sleep(settings.WATCH_TICK)
 
         while current_state != "ready":
             if not print_only_request_id and task_id:
@@ -2015,7 +2026,7 @@ def reserve(
                 current_state = "ready"
                 guest = search.group(1)
 
-            time.sleep(1)
+            time.sleep(settings.WATCH_TICK)
 
     console.print(f"🌎 ssh root@{guest}")
 

{tft_cli-0.0.25 → tft_cli-0.0.26}/src/tft/cli/config.py

@@ -12,9 +12,9 @@ settings = LazySettings(
     API_TOKEN=None,
     ISSUE_TRACKER="https://gitlab.com/testing-farm/general/-/issues/new",
     STATUS_PAGE="https://status.testing-farm.io",
-    ONBOARDING_DOCS="https://docs.testing-farm.io/general/0.1/onboarding.html",
+    ONBOARDING_DOCS="https://docs.testing-farm.io/Testing%20Farm/0.1/onboarding.html",
     CONTAINER_SIGN="/.testing-farm-container",
-    WATCH_TICK=3,
+    WATCH_TICK=30,
     DEFAULT_API_TIMEOUT=10,
     DEFAULT_API_RETRIES=7,
     # default reservation duration in minutes