diff --git a/rally/cli/commands/verify.py b/rally/cli/commands/verify.py index babc86260a..4498f9cbbd 100644 --- a/rally/cli/commands/verify.py +++ b/rally/cli/commands/verify.py @@ -235,7 +235,7 @@ class VerifyCommands(object): @cliutils.suppress_warnings def results(self, uuids=None, output_file=None, output_html=False, output_json=False, output_csv=False): - """Display results of a verification. + """Display results of verifications. :param verification: UUID of a verification :param output_file: Path to a file to save results @@ -375,9 +375,9 @@ class VerifyCommands(object): self.show(verification, sort_by, True) def compare(self, *args, **kwargs): - """Deprecated.""" - # NOTE(amaretskiy): this command is deprecated in favor of - # improved 'rally task results' + """Deprecated. Use `rally verify results' instead.""" + # NOTE(amaretskiy): deprecated since 'rally task results' has been + # improved and does same job much better print("This command is deprecated. Use 'rally task results' instead.") return 1 diff --git a/rally/ui/templates/ci/index_verify.html b/rally/ui/templates/ci/index_verify.html index 35bccac0f9..9e35613f9b 100644 --- a/rally/ui/templates/ci/index_verify.html +++ b/rally/ui/templates/ci/index_verify.html @@ -113,15 +113,15 @@ {% if compare %} [{{ compare.html.status }}] Compare two verifications and display results in HTML [Output from CLI] - $ rally verify compare --uuid-1 <uuid-1> --uuid-2 <uuid-2> --html + $ rally verify results --uuid <uuid-1> <uuid> --html [{{ compare.json.status }}] Compare two verifications and display results in JSON [Output from CLI] - $ rally verify compare --uuid-1 <uuid-1> --uuid-2 <uuid-2> --json + $ rally verify results --uuid <uuid-1> <uuid-2> --json [{{ compare.csv.status }}] Compare two verifications and display results in CSV [Output from CLI] - $ rally verify compare --uuid-1 <uuid-1> --uuid-2 <uuid-2> --csv + $ rally verify results --uuid <uuid-1> <uuid-2> --csv {% endif %} [{{ list.status }}] diff --git a/tests/ci/README.rst b/tests/ci/README.rst index 326cd070ce..43cfbb29f8 100644 --- a/tests/ci/README.rst +++ b/tests/ci/README.rst @@ -18,7 +18,7 @@ This script runs a functional tests suite for Rally CLI. The tests call a range rally-verify.sh --------------- This script runs various "rally verify" commands. This set of commands allow us to perform Tempest tests of OpenStack live cloud and display verification results. -The verification results obtained by running various "rally verify " commands including "start", "show", "list" are compared using the "rally-verify compare" command, which are then saved in csv, html and json formats in the "rally-verify" directory. +The verification results obtained by running various "rally verify " commands including "start", "show", "list" are compared using the "rally verify results" command, which are then saved in csv, html and json formats in the "rally-verify" directory. Jenkins uses this script by running the 'gate-rally-dsvm-verify' job.