Renmaing command name test-procedure to procedure, this should fix th…

…e failed integration tests from the last commit Signed-off-by: beaioun <[email protected]>
opensearch-project · Dec 6, 2023 · 11f17c8 · 11f17c8
1 parent 9a2d9fb
commit 11f17c8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/docs/api/execute-test.md b/docs/api/execute-test.md
@@ -72,7 +72,7 @@ Argument | Description | Required
 `workload-revision` | Define a specific revision in the workload repository that Benchmark should use. | No
 `workload` | Define the workload to use. List possible workloads with `opensearch-benchmark list workloads`. | No
 `workload-params` | Define a comma-separated list of key:value pairs that are injected verbatim to the workload as variables. | No
-`test-procedure` | Define the procedure to use. List possible procedures for workloads with `opensearch-benchmark list workloads`. | No
+`procedure` | Define the procedure to use. List possible procedures for workloads with `opensearch-benchmark list workloads`. | No
 `provision-config-instance` | Define the provision_config_instance to use. List possible provision_config_instances with `opensearch-benchmark list provision_config_instances` (default: `defaults`). | No
 `provision-config-instance-params` | Define a comma-separated list of key:value pairs that are injected verbatim as variables for the provision_config_instance. | No
 `runtime-jdk` | The major version of the runtime JDK to use. | No

diff --git a/it/distribution_test.py b/it/distribution_test.py
@@ -42,5 +42,5 @@ def test_docker_distribution(cfg):
     dist = it.DISTRIBUTIONS[-1]
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=\"docker\" --distribution-version=\"{dist}\" "
-                        f"--workload=\"geonames\" --test-procedure=\"append-no-conflicts-index-only\" --test-mode "
+                        f"--workload=\"geonames\" --procedure=\"append-no-conflicts-index-only\" --test-mode "
                         f"--provision-config-instance=4gheap --target-hosts=127.0.0.1:{port}") == 0
diff --git a/it/info_test.py b/it/info_test.py
@@ -28,7 +28,7 @@
 
 @it.benchmark_in_mem
 def test_workload_info_with_procedure(cfg):
-    assert it.osbenchmark(cfg, "info --workload=geonames --test-procedure=append-no-conflicts") == 0
+    assert it.osbenchmark(cfg, "info --workload=geonames --procedure=append-no-conflicts") == 0
 
 
 @it.benchmark_in_mem
@@ -38,7 +38,7 @@ def test_workload_info_with_workload_repo(cfg):
 
 @it.benchmark_in_mem
 def test_workload_info_with_task_filter(cfg):
-    assert it.osbenchmark(cfg, "info --workload=geonames --test-procedure=append-no-conflicts --include-tasks=\"type:search\"") == 0
+    assert it.osbenchmark(cfg, "info --workload=geonames --procedure=append-no-conflicts --include-tasks=\"type:search\"") == 0
 
 
 @it.benchmark_in_mem

diff --git a/it/sources_test.py b/it/sources_test.py
@@ -30,9 +30,9 @@ def test_sources(cfg):
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=from-sources --revision=latest \
                            --workload=geonames --test-mode  --target-hosts=127.0.0.1:{port} "
-                        f"--test-procedure=append-no-conflicts --provision-config-instance=4gheap "
+                        f"--procedure=append-no-conflicts --provision-config-instance=4gheap "
                         f"--opensearch-plugins=analysis-icu") == 0
 
     it.wait_until_port_is_free(port_number=port)
     assert it.execute_test(cfg, f"--pipeline=from-sources --workload=geonames --test-mode --target-hosts=127.0.0.1:{port} "
-                        f"--test-procedure=append-no-conflicts-index-only --provision-config-instance=\"4gheap,ea\"") == 0
+                        f"--procedure=append-no-conflicts-index-only --provision-config-instance=\"4gheap,ea\"") == 0
diff --git a/it/tracker_test.py b/it/tracker_test.py
@@ -48,7 +48,7 @@ def test_cluster():
 def test_create_workload(cfg, tmp_path, test_cluster):
     # prepare some data
     cmd = f"--test-mode --pipeline=benchmark-only --target-hosts=127.0.0.1:{test_cluster.http_port} " \
-          f" --workload=geonames --test-procedure=append-no-conflicts-index-only --quiet"
+          f" --workload=geonames --procedure=append-no-conflicts-index-only --quiet"
     assert it.execute_test(cfg, cmd) == 0
 
     # create the workload

diff --git a/osbenchmark/benchmark.py b/osbenchmark/benchmark.py
@@ -142,7 +142,7 @@ def add_workload_source(subparser):
         default=""
     )
     info_parser.add_argument(
-        "--test-procedure",
+        "--procedure",
         help=f"Define the procedure to use. List possible procedures for workloads with `{PROGRAM_NAME} list workloads`."
     )
     info_task_filter_group = info_parser.add_mutually_exclusive_group()
@@ -437,7 +437,7 @@ def add_workload_source(subparser):
         default=""
     )
     test_execution_parser.add_argument(
-        "--test-procedure",
+        "--procedure",
         help=f"Define the procedure to use. List possible procedures for workloads with `{PROGRAM_NAME} list workloads`.")
     test_execution_parser.add_argument(
         "--provision-config-instance",