This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch test-failing-composite-action in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 127c56b2c6b5632821c7ddc1e6232038c17a0689 Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Oct 30 21:31:12 2023 +0100 Testing --- Dockerfile.ci | 2 +- .../src/airflow_breeze/commands/ci_image_commands.py | 4 ++-- dev/breeze/src/airflow_breeze/utils/parallel.py | 18 ++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 48301ba232..a22d3fdee5 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -16,7 +16,7 @@ # # WARNING: THIS DOCKERFILE IS NOT INTENDED FOR PRODUCTION USE OR DEPLOYMENT. # -ARG PYTHON_BASE_IMAGE="python:3.8-slim-bullseye" +ARGxxx PYTHON_BASE_IMAGE="python:3.8-slim-bullseye" ############################################################################################## # This is the script image where we keep all inlined bash scripts needed in other segments diff --git a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py index f5ab0b2d0f..a2047aa118 100644 --- a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py @@ -277,8 +277,8 @@ def build( atexit.register(kill_process_group, pid) signal.signal(signal.SIGALRM, handler) signal.alarm(build_timeout_minutes * 60) - os.waitpid(pid, 0) - return + child_pid, exit_code = os.waitpid(pid, 0) + sys.exit(exit_code) else: # turn us into a process group leader os.setpgid(0, 0) diff --git a/dev/breeze/src/airflow_breeze/utils/parallel.py b/dev/breeze/src/airflow_breeze/utils/parallel.py index ea4ef06030..80415cc0e4 100644 --- a/dev/breeze/src/airflow_breeze/utils/parallel.py +++ b/dev/breeze/src/airflow_breeze/utils/parallel.py @@ -440,16 +440,14 @@ def check_async_run_results( get_console().print(f"\n[info]Summary: {outputs[i].escaped_title:<30}:\n") if print_lines: print(line) - try: - if errors: - get_console().print("\n[error]There were errors when running some tasks. Quitting.[/]\n") - sys.exit(1) - else: - get_console().print(f"\n[success]{success}[/]\n") - finally: - if not skip_cleanup: - for output in outputs: - Path(output.file_name).unlink(missing_ok=True) + if not skip_cleanup: + for output in outputs: + Path(output.file_name).unlink(missing_ok=True) + if errors: + get_console().print("\n[error]There were errors when running some tasks. Quitting.[/]\n") + sys.exit(1) + else: + get_console().print(f"\n[success]{success}[/]\n") @contextmanager
