From e4f616adcd7794cd1447c7598b636f284b06fe55 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Fri, 2 Sep 2022 23:42:33 +0200 Subject: [PATCH] Remove --limit-progress-output from helm-test It is not needed any more, as we do not run the tests in parallell and we have a better mechanism in parallel test. --- .../commands/testing_commands.py | 19 +--- .../commands/testing_commands_config.py | 1 - images/breeze/output-commands-hash.txt | 4 +- images/breeze/output_testing_helm-tests.svg | 104 ++++++++---------- 4 files changed, 51 insertions(+), 77 deletions(-) diff --git a/dev/breeze/src/airflow_breeze/commands/testing_commands.py b/dev/breeze/src/airflow_breeze/commands/testing_commands.py index 9ae90671e3b1e..a727585df1df4 100644 --- a/dev/breeze/src/airflow_breeze/commands/testing_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/testing_commands.py @@ -306,11 +306,6 @@ def tests( ) @option_dry_run @option_verbose -@click.option( - '--limit-progress-output', - help="Limit progress to percentage only and just show the summary when tests complete.", - is_flag=True, -) @option_image_tag_for_running @option_mount_sources @click.argument('extra_pytest_args', nargs=-1, type=click.UNPROCESSED) @@ -319,7 +314,6 @@ def helm_tests( verbose: bool, extra_pytest_args: Tuple, image_tag: Optional[str], - limit_progress_output: bool, mount_sources: str, ): exec_shell_params = ShellParams( @@ -334,16 +328,5 @@ def helm_tests( perform_environment_checks(verbose=verbose) cmd = ['docker-compose', 'run', '--service-ports', '--rm', 'airflow'] cmd.extend(list(extra_pytest_args)) - if limit_progress_output: - result = run_with_progress( - cmd=cmd, - python=exec_shell_params.python, - backend=exec_shell_params.backend, - test_type='Helm', - env_variables=env_variables, - verbose=verbose, - dry_run=dry_run, - ) - else: - result = run_command(cmd, verbose=verbose, dry_run=dry_run, env=env_variables, check=False) + result = run_command(cmd, verbose=verbose, dry_run=dry_run, env=env_variables, check=False) sys.exit(result.returncode) diff --git a/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py b/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py index e44e8500fd2a3..b86758990ebf1 100644 --- a/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py +++ b/dev/breeze/src/airflow_breeze/commands/testing_commands_config.py @@ -49,7 +49,6 @@ { "name": "Advanced flag for helms-tests command", "options": [ - "--limit-progress-output", "--image-tag", "--mount-sources", ], diff --git a/images/breeze/output-commands-hash.txt b/images/breeze/output-commands-hash.txt index 76cc498a9c1b6..ff1367c56a4fc 100644 --- a/images/breeze/output-commands-hash.txt +++ b/images/breeze/output-commands-hash.txt @@ -52,6 +52,6 @@ start-airflow:17b93add6c8ea218e9e5f0e0360d59ac static-checks:97d324104420f051378f372d8c589d9a stop:8ebd8a42f1003495d37b884de5ac7ce6 testing:docker-compose-tests:3e07be65e30219930d3c62a593dd8c6a -testing:helm-tests:66894434df46efe2f51bcb6dd168992d +testing:helm-tests:403231f0a94b261f9c7aae8aea03ec50 testing:tests:32deda30f3899e8ae6e241238f990d68 -testing:325509289c9e2880e390a8cef687ac90 +testing:e747ece268ba502c106924eb2f46c550 diff --git a/images/breeze/output_testing_helm-tests.svg b/images/breeze/output_testing_helm-tests.svg index 958d1781d7c70..7e1cf8947c02b 100644 --- a/images/breeze/output_testing_helm-tests.svg +++ b/images/breeze/output_testing_helm-tests.svg @@ -1,4 +1,4 @@ - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - Command: testing helm-tests + Command: testing helm-tests - + - - -Usage: breeze testing helm-tests [OPTIONS] [EXTRA_PYTEST_ARGS]... - -Run Helm chart tests. - -╭─ Advanced flag for helms-tests command ──────────────────────────────────────────────────────────────────────────────╮ -│--limit-progress-outputLimit progress to percentage only and just show the summary when tests complete.│ -│--image-tag-tTag of the image which is used to run the image (implies --mount-sources=skip)(TEXT)│ -│[default: latest]                                                             │ -│--mount-sourcesChoose scope of local sources that should be mounted, skipped, or removed (default =   │ -│selected).                                                                             │ -│(selected | all | skip | remove)                                                       │ -│[default: selected]                                                                    │ -╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ -╭─ Common options ─────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│--dry-run-DIf dry-run is set, commands are only printed, not executed.│ -│--verbose-vPrint verbose information about performed steps.│ -│--help-hShow this message and exit.│ -╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ + + +Usage: breeze testing helm-tests [OPTIONS] [EXTRA_PYTEST_ARGS]... + +Run Helm chart tests. + +╭─ Advanced flag for helms-tests command ──────────────────────────────────────────────────────────────────────────────╮ +│--image-tag-tTag of the image which is used to run the image (implies --mount-sources=skip)(TEXT)│ +│[default: latest]                                                             │ +│--mount-sourcesChoose scope of local sources that should be mounted, skipped, or removed (default = selected).│ +│(selected | all | skip | remove)                                                               │ +│[default: selected]                                                                            │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─ Common options ─────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│--dry-run-DIf dry-run is set, commands are only printed, not executed.│ +│--verbose-vPrint verbose information about performed steps.│ +│--help-hShow this message and exit.│ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯