From cacdcbb499b25bb0a492df5dc14f9350a1c0e710 Mon Sep 17 00:00:00 2001 From: Miretpl Date: Tue, 12 May 2026 22:12:47 +0200 Subject: [PATCH 1/3] Match chart 1-2x line branches in tests --- .github/workflows/ci-amd-arm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-amd-arm.yml b/.github/workflows/ci-amd-arm.yml index 25b9ac4e64ce0..8dacfbe29457e 100644 --- a/.github/workflows/ci-amd-arm.yml +++ b/.github/workflows/ci-amd-arm.yml @@ -23,12 +23,15 @@ on: # yamllint disable-line rule:truthy push: branches: - v[0-9]+-[0-9]+-test + - chart/v[0-9]+-[0-9]x+-test - providers-[a-z]+-?[a-z]*/v[0-9]+-[0-9]+ pull_request: branches: - main - v[0-9]+-[0-9]+-test + - chart/v[0-9]+-[0-9]x+-test - v[0-9]+-[0-9]+-stable + - chart/v[0-9]+-[0-9]x+-stable - providers-[a-z]+-?[a-z]*/v[0-9]+-[0-9]+ types: [opened, reopened, synchronize, ready_for_review] workflow_dispatch: From a8f884790df80c0b29dfd24036b0c658c66759fa Mon Sep 17 00:00:00 2001 From: Miretpl Date: Wed, 13 May 2026 18:16:20 +0200 Subject: [PATCH 2/3] Update uv version --- .github/actions/breeze/action.yml | 2 +- .github/actions/install-prek/action.yml | 2 +- .github/workflows/basic-tests.yml | 2 +- .github/workflows/ci-amd-arm.yml | 2 +- .github/workflows/release_dockerhub_image.yml | 2 +- scripts/tools/setup_breeze | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/breeze/action.yml b/.github/actions/breeze/action.yml index 80b69f5eb4de3..e36a685a5da52 100644 --- a/.github/actions/breeze/action.yml +++ b/.github/actions/breeze/action.yml @@ -24,7 +24,7 @@ inputs: default: "3.10" uv-version: description: 'uv version to use' - default: "0.10.12" # Keep this comment to allow automatic replacement of uv version + default: "0.11.8" # Keep this comment to allow automatic replacement of uv version outputs: host-python-version: description: Python version used in host diff --git a/.github/actions/install-prek/action.yml b/.github/actions/install-prek/action.yml index 94c29262cb016..d763c005fbd16 100644 --- a/.github/actions/install-prek/action.yml +++ b/.github/actions/install-prek/action.yml @@ -24,7 +24,7 @@ inputs: default: "3.10" uv-version: description: 'uv version to use' - default: "0.10.12" # Keep this comment to allow automatic replacement of uv version + default: "0.11.8" # Keep this comment to allow automatic replacement of uv version prek-version: description: 'prek version to use' default: "0.3.6" # Keep this comment to allow automatic replacement of prek version diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml index a37b06c49c9e1..dfa988fb9c6bf 100644 --- a/.github/workflows/basic-tests.yml +++ b/.github/workflows/basic-tests.yml @@ -74,7 +74,7 @@ on: # yamllint disable-line rule:truthy type: string uv-version: description: 'uv version to use' - default: "0.10.12" # Keep this comment to allow automatic replacement of uv version + default: "0.11.8" # Keep this comment to allow automatic replacement of uv version type: string platform: description: 'Platform for the build - linux/amd64 or linux/arm64' diff --git a/.github/workflows/ci-amd-arm.yml b/.github/workflows/ci-amd-arm.yml index 8dacfbe29457e..d195997f5b52e 100644 --- a/.github/workflows/ci-amd-arm.yml +++ b/.github/workflows/ci-amd-arm.yml @@ -43,7 +43,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.actor }} SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} - UV_VERSION: "0.10.12" # Keep this comment to allow automatic replacement of uv version + UV_VERSION: "0.11.8" # Keep this comment to allow automatic replacement of uv version VERBOSE: "true" concurrency: diff --git a/.github/workflows/release_dockerhub_image.yml b/.github/workflows/release_dockerhub_image.yml index bee1781e19947..efedaa8061cc4 100644 --- a/.github/workflows/release_dockerhub_image.yml +++ b/.github/workflows/release_dockerhub_image.yml @@ -58,7 +58,7 @@ jobs: AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }} AMD_ONLY: ${{ github.event.inputs.amdOnly }} LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }} - UV_VERSION: "0.10.12" # Keep this comment to allow automatic replacement of uv version + UV_VERSION: "0.11.8" # Keep this comment to allow automatic replacement of uv version if: contains(fromJSON('[ "ashb", "bugraoz93", diff --git a/scripts/tools/setup_breeze b/scripts/tools/setup_breeze index c39357d7b5100..e119dce0d12d1 100755 --- a/scripts/tools/setup_breeze +++ b/scripts/tools/setup_breeze @@ -27,7 +27,7 @@ COLOR_YELLOW=$'\e[33m' COLOR_BLUE=$'\e[34m' COLOR_RESET=$'\e[0m' -UV_VERSION="0.10.12" +UV_VERSION="0.11.8" function manual_instructions() { echo From 455bb5a6349230f120ea4149e2f1316167ff0edf Mon Sep 17 00:00:00 2001 From: Miretpl Date: Wed, 13 May 2026 22:03:35 +0200 Subject: [PATCH 3/3] Disable providers & ui e2e tests --- .github/workflows/ci-amd-arm.yml | 4 ++- .../airflow_breeze/utils/selective_checks.py | 8 +++-- dev/breeze/tests/test_selective_checks.py | 32 +++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-amd-arm.yml b/.github/workflows/ci-amd-arm.yml index d195997f5b52e..fef5615c381e7 100644 --- a/.github/workflows/ci-amd-arm.yml +++ b/.github/workflows/ci-amd-arm.yml @@ -713,7 +713,9 @@ jobs: permissions: contents: read packages: read - if: needs.build-info.outputs.run-unit-tests == 'true' + if: > + needs.build-info.outputs.skip-providers-tests != 'true' && + needs.build-info.outputs.run-unit-tests == 'true' with: runners: ${{ needs.build-info.outputs.runner-type }} platform: ${{ needs.build-info.outputs.platform }} diff --git a/dev/breeze/src/airflow_breeze/utils/selective_checks.py b/dev/breeze/src/airflow_breeze/utils/selective_checks.py index 1985da6ece1dd..7fd096981aac4 100644 --- a/dev/breeze/src/airflow_breeze/utils/selective_checks.py +++ b/dev/breeze/src/airflow_breeze/utils/selective_checks.py @@ -944,7 +944,11 @@ def run_ui_tests(self) -> bool: @cached_property def run_ui_e2e_tests(self) -> bool: - return self._should_be_run(FileGroupForCi.UI_FILES) + return ( + self._should_be_run(FileGroupForCi.UI_FILES) + and self._default_branch != "main" + and (not self._default_branch.startswith("chart/v1-2x")) + ) @cached_property def run_remote_logging_s3_e2e_tests(self) -> bool: @@ -1468,7 +1472,7 @@ def skip_prek_hooks(self) -> str: @cached_property def skip_providers_tests(self) -> bool: - if self._default_branch != "main": + if self._default_branch != "main" or (not self._default_branch.startswith("chart/v1-2x")): return True if self.full_tests_needed: return False diff --git a/dev/breeze/tests/test_selective_checks.py b/dev/breeze/tests/test_selective_checks.py index bd26d1f6ba573..41e47daac0e3b 100644 --- a/dev/breeze/tests/test_selective_checks.py +++ b/dev/breeze/tests/test_selective_checks.py @@ -476,7 +476,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): ), "run-mypy": "true", "mypy-checks": "['mypy-providers']", - "skip-providers-tests": "false", + "skip-providers-tests": "true", }, id="Selected Providers should run when system tests are modified", ) @@ -523,7 +523,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): ), "run-mypy": "true", "mypy-checks": "['mypy-providers']", - "skip-providers-tests": "false", + "skip-providers-tests": "true", }, id="Selected Providers and docs should run when both system tests and tests are modified", ) @@ -570,7 +570,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): ), "run-mypy": "true", "mypy-checks": "['mypy-providers']", - "skip-providers-tests": "false", + "skip-providers-tests": "true", }, id="Selected Providers and docs should run when both system tests and tests are modified for more than one provider", ) @@ -620,7 +620,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): "docs-build": "true", "full-tests-needed": "false", "skip-prek-hooks": ALL_SKIPPED_COMMITS_IF_NO_PROVIDERS_UI_AND_HELM_TESTS, - "skip-providers-tests": "false", + "skip-providers-tests": "true", "upgrade-to-newer-dependencies": "false", "core-test-types-list-as-strings-in-json": ALL_CI_SELECTIVE_TEST_TYPES_AS_JSON, "providers-test-types-list-as-strings-in-json": ALL_PROVIDERS_SELECTIVE_TEST_TYPES_AS_JSON, @@ -1148,7 +1148,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): "python-versions": f"['{DEFAULT_PYTHON_MAJOR_MINOR_VERSION}']", "python-versions-list-as-string": DEFAULT_PYTHON_MAJOR_MINOR_VERSION, "ci-image-build": "true", - "prod-image-build": "true", + "prod-image-build": "false", "docs-build": "false", "full-tests-needed": "false", "skip-prek-hooks": ALL_SKIPPED_COMMITS_IF_NO_CODE_PROVIDERS_AND_HELM_TESTS, @@ -1157,7 +1157,7 @@ def assert_outputs_are_printed(expected_outputs: dict[str, str], stderr: str): "mypy-checks": "[]", "run-helm-tests": "false", "run-ui-tests": "true", - "run-ui-e2e-tests": "true", + "run-ui-e2e-tests": "false", "run-unit-tests": "false", "run-go-sdk-tests": "false", "run-airflow-ctl-tests": "false", @@ -1466,7 +1466,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1501,7 +1501,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1536,7 +1536,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1571,7 +1571,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1607,7 +1607,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1643,7 +1643,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -1676,7 +1676,7 @@ def test_full_test_needed_when_scripts_changes(files: tuple[str, ...], expected_ "ci-image-build": "true", "prod-image-build": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": ALL_DOCS_SELECTED_FOR_BUILD, "full-tests-needed": "true", @@ -2020,7 +2020,7 @@ def test_expected_output_push( "prod-image-build": "true", "run-helm-tests": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": "apache-airflow helm-chart amazon apache.cassandra " "apache.kafka cncf.kubernetes common.compat common.messaging common.sql databricks facebook google hashicorp http microsoft.azure " @@ -2081,7 +2081,7 @@ def test_expected_output_push( "ci-image-build": "true", "run-helm-tests": "true", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "true", "docs-list-as-string": "", "upgrade-to-newer-dependencies": "false", @@ -2109,7 +2109,7 @@ def test_expected_output_push( "prod-image-build": "false", "run-helm-tests": "false", "run-unit-tests": "true", - "skip-providers-tests": "false", + "skip-providers-tests": "true", "docs-build": "false", "skip-prek-hooks": ALL_SKIPPED_COMMITS_ON_NO_CI_IMAGE, "run-kubernetes-tests": "false",