From 8ed0cc56b5a55b30c913ab380f4a19b4cb503f6a Mon Sep 17 00:00:00 2001 From: Tobias Persson Date: Fri, 17 Jan 2025 13:08:46 +0100 Subject: [PATCH 1/2] Ensure that the dataset is passed in as a list --- cli/src/etos_client/etos/v0/subcommands/start.py | 2 +- cli/src/etos_client/etos/v1alpha/subcommands/start.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/src/etos_client/etos/v0/subcommands/start.py b/cli/src/etos_client/etos/v0/subcommands/start.py index c6854fee..4f8d0cb2 100644 --- a/cli/src/etos_client/etos/v0/subcommands/start.py +++ b/cli/src/etos_client/etos/v0/subcommands/start.py @@ -32,7 +32,7 @@ class Start(SubCommand): """ Client for executing test automation suites in ETOS. - Usage: etosctl testrun v0 start [-v|-vv] [options] -i IDENTITY -s TEST_SUITE + Usage: etosctl testrun v0 start [-v|-vv] [options] [--dataset=DATASET]... -i IDENTITY -s TEST_SUITE Options: -h, --help Show this help message and exit diff --git a/cli/src/etos_client/etos/v1alpha/subcommands/start.py b/cli/src/etos_client/etos/v1alpha/subcommands/start.py index b363f841..6ede1e55 100644 --- a/cli/src/etos_client/etos/v1alpha/subcommands/start.py +++ b/cli/src/etos_client/etos/v1alpha/subcommands/start.py @@ -31,7 +31,7 @@ class Start(SubCommand): """ Client for executing test automation suites in ETOS. - Usage: etosctl testrun v1alpha start [-v|-vv] [options] -i IDENTITY -s TEST_SUITE + Usage: etosctl testrun v1alpha start [-v|-vv] [options] [--dataset=DATASET]... -i IDENTITY -s TEST_SUITE Options: -h, --help Show this help message and exit From 2d33a9b26b3f309af9d8e5dc625f2b5a4fe069c2 Mon Sep 17 00:00:00 2001 From: Tobias Persson Date: Fri, 17 Jan 2025 13:26:17 +0100 Subject: [PATCH 2/2] Make sure we can start v1alpha --- cli/src/etos_client/etos/v1alpha/subcommands/start.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cli/src/etos_client/etos/v1alpha/subcommands/start.py b/cli/src/etos_client/etos/v1alpha/subcommands/start.py index 6ede1e55..7b722088 100644 --- a/cli/src/etos_client/etos/v1alpha/subcommands/start.py +++ b/cli/src/etos_client/etos/v1alpha/subcommands/start.py @@ -22,6 +22,7 @@ from etos_client.types.result import Conclusion, Verdict from etos_client.etos.v1alpha.etos import Etos +from etos_client.sse.v1.client import SSEClient from etosctl.command import SubCommand from etosctl.models import CommandMeta @@ -68,7 +69,7 @@ def run(self, args: dict) -> None: warnings.warn("This is an alpha version of ETOS! Don't expect it to work properly") self.logger.info("Running in cluster: %r", args[""]) - etos = Etos(args) + etos = Etos(args, SSEClient(args[""])) result = etos.run() if result.conclusion == Conclusion.FAILED: sys.exit(result.reason)