You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ep...@apache.org on 2022/06/01 07:43:36 UTC
[airflow] 06/12: Add foldable groups in CI outputs in commands that need it (#24035)
This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 726a0efdebdb90ecd1409f1b5ab9cef9301db0c4
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Tue May 31 09:41:18 2022 +0200
Add foldable groups in CI outputs in commands that need it (#24035)
This is follow-up after #24026 which added capability of selectively
deciding for each breeze command, whether the output of the command
should be "foldable" group. All CI output has been reviewed, and
the commands which "need" it were identified.
This also fixes a problem introduced there - that the command itself
was not "foldable" group itself.
(cherry picked from commit 2551acb692f2e5cae91808a907a75db404eb79be)
---
.../commands/configuration_and_maintenance_commands.py | 12 ++++++++++--
.../src/airflow_breeze/commands/production_image_commands.py | 1 +
.../airflow_breeze/commands/release_management_commands.py | 2 ++
dev/breeze/src/airflow_breeze/utils/ci_group.py | 2 +-
dev/breeze/src/airflow_breeze/utils/image.py | 1 -
dev/breeze/src/airflow_breeze/utils/run_utils.py | 2 +-
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dev/breeze/src/airflow_breeze/commands/configuration_and_maintenance_commands.py b/dev/breeze/src/airflow_breeze/commands/configuration_and_maintenance_commands.py
index 2d7eb88f21..818ba49ee8 100644
--- a/dev/breeze/src/airflow_breeze/commands/configuration_and_maintenance_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/configuration_and_maintenance_commands.py
@@ -177,7 +177,13 @@ def cleanup(verbose: bool, dry_run: bool, github_repository: str, all: bool, ans
given_answer = user_confirm("Are you sure with the removal?")
if given_answer == Answer.YES:
system_prune_command_to_execute = ['docker', 'system', 'prune']
- run_command(system_prune_command_to_execute, verbose=verbose, dry_run=dry_run, check=False)
+ run_command(
+ system_prune_command_to_execute,
+ verbose=verbose,
+ dry_run=dry_run,
+ check=False,
+ enabled_output_group=True,
+ )
elif given_answer == Answer.QUIT:
sys.exit(0)
get_console().print(f"Removing build cache dir ${BUILD_CACHE_DIR}")
@@ -455,7 +461,9 @@ def fix_ownership(github_repository: str, verbose: bool, dry_run: bool):
shell_params.airflow_image_name_with_tag,
"/opt/airflow/scripts/in_container/run_fix_ownership.sh",
]
- run_command(cmd, verbose=verbose, dry_run=dry_run, text=True, env=env, check=False)
+ run_command(
+ cmd, verbose=verbose, dry_run=dry_run, text=True, env=env, check=False, enabled_output_group=True
+ )
# Always succeed
sys.exit(0)
diff --git a/dev/breeze/src/airflow_breeze/commands/production_image_commands.py b/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
index 5418eac696..8ac7aacab0 100644
--- a/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
@@ -533,6 +533,7 @@ def build_production_image(
cwd=AIRFLOW_SOURCES_ROOT,
check=False,
text=True,
+ enabled_output_group=True,
)
if build_command_result.returncode == 0:
if prod_image_params.tag_as_latest:
diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
index ba40e373a8..ce80e6a193 100644
--- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py
@@ -267,6 +267,7 @@ def prepare_airflow_packages(
verbose=verbose,
dry_run=dry_run,
debug=debug,
+ enabled_output_group=True,
)
sys.exit(result_command.returncode)
@@ -550,6 +551,7 @@ def verify_provider_packages(
verbose=verbose,
dry_run=dry_run,
debug=debug,
+ enabled_output_group=True,
)
sys.exit(result_command.returncode)
diff --git a/dev/breeze/src/airflow_breeze/utils/ci_group.py b/dev/breeze/src/airflow_breeze/utils/ci_group.py
index e0cb7b41ee..e65751a322 100644
--- a/dev/breeze/src/airflow_breeze/utils/ci_group.py
+++ b/dev/breeze/src/airflow_breeze/utils/ci_group.py
@@ -37,6 +37,6 @@ def ci_group(title: str, enabled: bool = True):
get_console().print(f"[info]{title}[/]")
yield
return
- get_console().print(f"::group::<EXPAND>: [info]{title}[/]")
+ get_console().print(f"::group::<CLICK_TO_EXPAND>: [info]{title}[/]")
yield
get_console().print("::endgroup::")
diff --git a/dev/breeze/src/airflow_breeze/utils/image.py b/dev/breeze/src/airflow_breeze/utils/image.py
index 5030bd669a..8cd516bb47 100644
--- a/dev/breeze/src/airflow_breeze/utils/image.py
+++ b/dev/breeze/src/airflow_breeze/utils/image.py
@@ -125,7 +125,6 @@ def run_pull_image(
dry_run=dry_run,
text=True,
check=False,
- enabled_output_group=not parallel,
)
if not dry_run:
if command_result.returncode == 0:
diff --git a/dev/breeze/src/airflow_breeze/utils/run_utils.py b/dev/breeze/src/airflow_breeze/utils/run_utils.py
index 4c2f5b57f3..f0a44b425f 100644
--- a/dev/breeze/src/airflow_breeze/utils/run_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/run_utils.py
@@ -88,7 +88,7 @@ def run_command(
if verbose or dry_run:
command_to_print = ' '.join(shlex.quote(c) for c in cmd)
env_to_print = get_environments_to_print(env)
- with ci_group(title=f"Running {title}", enabled=enabled_output_group):
+ with ci_group(title=f"Running {title}"):
get_console().print(f"\n[info]Working directory {workdir} [/]\n")
# Soft wrap allows to copy&paste and run resulting output as it has no hard EOL
get_console().print(f"\n[info]{env_to_print}{command_to_print}[/]\n", soft_wrap=True)