Skip to content

Fix inconsistency of cache-directive vs. docker-cache #38580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Mar 28, 2024
Merged

Fix inconsistency of cache-directive vs. docker-cache #38580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
run-kubernetes-tests: ${{ steps.selective-checks.outputs.run-kubernetes-tests }}
ci-image-build: ${{ steps.selective-checks.outputs.ci-image-build }}
prod-image-build: ${{ steps.selective-checks.outputs.prod-image-build }}
cache-directive: ${{ steps.selective-checks.outputs.cache-directive }}
docker-cache: ${{ steps.selective-checks.outputs.docker-cache }}
default-branch: ${{ steps.selective-checks.outputs.default-branch }}
constraints-branch: ${{ steps.selective-checks.outputs.default-constraints-branch }}
runs-on: ${{steps.selective-checks.outputs.runs-on}}
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
branch: ${{ needs.build-info.outputs.default-branch }}
constraints-branch: ${{ needs.build-info.outputs.constraints-branch }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}

build-prod-images:
name: Build PROD images
Expand Down Expand Up @@ -220,4 +220,4 @@ jobs:
build-provider-packages: "true"
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
chicken-egg-providers: ${{ needs.build-info.outputs.chicken-egg-providers }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
GITHUB_CONTEXT: ${{ toJson(github) }}
outputs:
image-tag: ${{ github.event.pull_request.head.sha || github.sha }}
cache-directive: ${{ steps.selective-checks.outputs.cache-directive }}
docker-cache: ${{ steps.selective-checks.outputs.docker-cache }}
affected-providers-list-as-string: >-
${{ steps.selective-checks.outputs.affected-providers-list-as-string }}
upgrade-to-newer-dependencies: ${{ steps.selective-checks.outputs.upgrade-to-newer-dependencies }}
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
use-uv: "true"
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
constraints-branch: ${{ needs.build-info.outputs.default-constraints-branch }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}

wait-for-ci-images:
timeout-minutes: 120
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
default-python-version: ${{ needs.build-info.outputs.default-python-version }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
skip-pre-commits: ${{ needs.build-info.outputs.skip-pre-commits }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}
canary-run: ${{ needs.build-info.outputs.canary-run }}
mypy-folders: ${{ needs.build-info.outputs.mypy-folders }}
needs-mypy: ${{ needs.build-info.outputs.needs-mypy }}
Expand Down Expand Up @@ -502,7 +502,7 @@ jobs:
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
chicken-egg-providers: ${{ needs.build-info.outputs.chicken-egg-providers }}
constraints-branch: ${{ needs.build-info.outputs.default-constraints-branch }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}

wait-for-prod-images:
timeout-minutes: 80
Expand Down Expand Up @@ -558,7 +558,7 @@ jobs:
image-tag: ${{ needs.build-info.outputs.image-tag }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
chicken-egg-providers: ${{ needs.build-info.outputs.chicken-egg-providers }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}
default-python-version: ${{ needs.build-info.outputs.default-python-version }}
canary-run: ${{ needs.build-info.outputs.canary-run }}
if: needs.build-info.outputs.prod-image-build == 'true'
Expand Down Expand Up @@ -613,5 +613,5 @@ jobs:
in-workflow-build: ${{ needs.build-info.outputs.in-workflow-build }}
upgrade-to-newer-dependencies: ${{ needs.build-info.outputs.upgrade-to-newer-dependencies }}
include-success-outputs: ${{ needs.build-info.outputs.include-success-outputs }}
docker-cache: ${{ needs.build-info.outputs.cache-directive }}
docker-cache: ${{ needs.build-info.outputs.docker-cache }}
canary-run: ${{ needs.build-info.outputs.canary-run }}
4 changes: 2 additions & 2 deletions dev/breeze/doc/ci/04_selective_checks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ Github Actions to pass the list of parameters to a command to execute
| all-versions | If set to true, then all python, k8s, DB versions are used for tests. | false | |
| basic-checks-only | Whether to run all static checks ("false") or only basic set of static checks ("true") | false | |
| build_system_changed_in_pyproject_toml | When builds system dependencies changed in pyproject.toml changed in the PR. | false | |
| cache-directive | Which cache should be used for images ("registry", "local" , "disabled") | registry | |
| chicken-egg-providers | List of providers that should be considered as "chicken-egg" - expecting development Airflow version | | |
| ci-image-build | Whether CI image build is needed | true | |
| debug-resources | Whether resources usage should be printed during parallel job execution ("true"/ "false") | false | |
Expand All @@ -184,6 +183,7 @@ Github Actions to pass the list of parameters to a command to execute
| default-mysql-version | Which MySQL version to use as default | 5.7 | |
| default-postgres-version | Which Postgres version to use as default | 10 | |
| default-python-version | Which Python version to use as default | 3.8 | |
| docker-cache | Which cache should be used for images ("registry", "local" , "disabled") | registry | |
| docs-build | Whether to build documentation ("true"/"false") | true | |
| docs-list-as-string | What filter to apply to docs building - based on which documentation packages should be built | apache-airflow helm-chart google | |
| full-tests-needed | Whether this build runs complete set of tests or only subset (for faster PR builds) [1] | false | |
Expand Down Expand Up @@ -301,7 +301,7 @@ am overview of possible labels and their meaning:
| canary | is-canary-run | If set, the PR run from apache/airflow repo behaves as `canary` run (can only be run by maintainer). |
| debug ci resources | debug-ci-resources | If set, then debugging resources is enabled during parallel tests and you can see them in the output. |
| default versions only | all-versions, *-versions-* | If set, the number of Python and Kubernetes, DB versions used by the build will be limited to the default ones. |
| disable image cache | cache-directive | If set, the image cache is disables when building the image. |
| disable image cache | docker-cache | If set, the image cache is disables when building the image. |
| include success outputs | include-success-outputs | By default, outputs of successful parallel tests are not shown - enabling this flag will make then shown. |
| latest versions only | *-versions-*, *-versions-* | If set, the number of Python, Kubernetes, DB versions used by the build will be limited to the latest ones. |
| all versions | all-versions, *-versions-* | Run tests for all python and k8s versions. |
Expand Down
2 changes: 1 addition & 1 deletion dev/breeze/src/airflow_breeze/utils/selective_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ def skip_provider_tests(self) -> bool:
return True

@cached_property
def cache_directive(self) -> str:
def docker_cache(self) -> str:
return (
"disabled"
if (self._github_event == GithubEvents.SCHEDULE or DISABLE_IMAGE_CACHE_LABEL in self._pr_labels)
Expand Down