This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new bc51c94b8e Manually run and "schedule" "Tests" workflow should be
treated as canary run (#40914)
bc51c94b8e is described below
commit bc51c94b8e0bdd24dead46111f3ef9213d179ffe
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sun Jul 21 22:45:03 2024 +0200
Manually run and "schedule" "Tests" workflow should be treated as canary
run (#40914)
---
.github/workflows/additional-prod-image-tests.yml | 2 +-
.../src/airflow_breeze/commands/ci_commands.py | 27 ++++++++++++++--------
.../src/airflow_breeze/params/shell_params.py | 3 ++-
dev/breeze/tests/test_pr_info.py | 2 +-
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/additional-prod-image-tests.yml
b/.github/workflows/additional-prod-image-tests.yml
index a584be8cf1..4c9606e134 100644
--- a/.github/workflows/additional-prod-image-tests.yml
+++ b/.github/workflows/additional-prod-image-tests.yml
@@ -65,7 +65,7 @@ jobs:
python-versions: "[ '${{ inputs.default-python-version }}' ]"
default-python-version: ${{ inputs.default-python-version }}
branch: ${{ inputs.default-branch }}
- use-uv: "true"
+ use-uv: "false"
image-tag: ${{ inputs.image-tag }}
build-provider-packages: ${{ inputs.default-branch == 'main' }}
upgrade-to-newer-dependencies: ${{ inputs.upgrade-to-newer-dependencies
}}
diff --git a/dev/breeze/src/airflow_breeze/commands/ci_commands.py
b/dev/breeze/src/airflow_breeze/commands/ci_commands.py
index 946a321852..c201c1b497 100644
--- a/dev/breeze/src/airflow_breeze/commands/ci_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/ci_commands.py
@@ -314,7 +314,7 @@ class WorkflowInfo(NamedTuple):
return RUNS_ON_SELF_HOSTED_RUNNER
def in_workflow_build(self) -> str:
- if self.event_name == "push" or self.head_repo == self.target_repo:
+ if self.event_name == GithubEvents.PUSH.value or self.head_repo ==
self.target_repo:
return "true"
return "false"
@@ -325,7 +325,12 @@ class WorkflowInfo(NamedTuple):
def is_canary_run(self) -> str:
if (
- self.event_name == "push"
+ self.event_name
+ in [
+ GithubEvents.PUSH.value,
+ GithubEvents.WORKFLOW_DISPATCH.value,
+ GithubEvents.SCHEDULE.value,
+ ]
and self.head_repo == "apache/airflow"
and self.ref_name
and (self.ref_name == "main" or
TEST_BRANCH_MATCHER.match(self.ref_name))
@@ -336,7 +341,11 @@ class WorkflowInfo(NamedTuple):
return "false"
def run_coverage(self) -> str:
- if self.event_name == "push" and self.head_repo == "apache/airflow"
and self.ref == "refs/heads/main":
+ if (
+ self.event_name == GithubEvents.PUSH.value
+ and self.head_repo == "apache/airflow"
+ and self.ref == "refs/heads/main"
+ ):
return "true"
return "false"
@@ -353,10 +362,10 @@ def workflow_info(context: str) -> WorkflowInfo:
pr_number: int | None = None
ref_name = ctx.get("ref_name")
ref = ctx.get("ref")
- if event_name == "pull_request":
+ if event_name == GithubEvents.PULL_REQUEST.value:
event = ctx.get("event")
if event:
- pr = event.get("pull_request")
+ pr = event.get(GithubEvents.PULL_REQUEST.value)
if pr:
labels = pr.get("labels")
if labels:
@@ -365,19 +374,19 @@ def workflow_info(context: str) -> WorkflowInfo:
target_repo = pr["base"]["repo"]["full_name"]
head_repo = pr["head"]["repo"]["full_name"]
pr_number = pr["number"]
- elif event_name == "push":
+ elif event_name == GithubEvents.PUSH.value:
target_repo = ctx["repository"]
head_repo = ctx["repository"]
event_name = ctx["event_name"]
- elif event_name == "schedule":
+ elif event_name == GithubEvents.SCHEDULE.value:
target_repo = ctx["repository"]
head_repo = ctx["repository"]
event_name = ctx["event_name"]
- elif event_name == "workflow_dispatch":
+ elif event_name == GithubEvents.WORKFLOW_DISPATCH.value:
target_repo = ctx["repository"]
head_repo = ctx["repository"]
event_name = ctx["event_name"]
- elif event_name == "pull_request_target":
+ elif event_name == GithubEvents.PULL_REQUEST_TARGET.value:
target_repo = ctx["repository"]
head_repo = ctx["repository"]
event_name = ctx["event_name"]
diff --git a/dev/breeze/src/airflow_breeze/params/shell_params.py
b/dev/breeze/src/airflow_breeze/params/shell_params.py
index 0cf196f66b..a0504ee7a3 100644
--- a/dev/breeze/src/airflow_breeze/params/shell_params.py
+++ b/dev/breeze/src/airflow_breeze/params/shell_params.py
@@ -55,6 +55,7 @@ from airflow_breeze.global_constants import (
TESTABLE_INTEGRATIONS,
USE_AIRFLOW_MOUNT_SOURCES,
WEBSERVER_HOST_PORT,
+ GithubEvents,
get_airflow_version,
)
from airflow_breeze.utils.console import get_console
@@ -498,7 +499,7 @@ class ShellParams:
_set_var(_env, "CHICKEN_EGG_PROVIDERS", self.chicken_egg_providers)
_set_var(_env, "CI", None, "false")
_set_var(_env, "CI_BUILD_ID", None, "0")
- _set_var(_env, "CI_EVENT_TYPE", None, "pull_request")
+ _set_var(_env, "CI_EVENT_TYPE", None, GithubEvents.PULL_REQUEST.value)
_set_var(_env, "CI_JOB_ID", None, "0")
_set_var(_env, "CI_TARGET_BRANCH", self.airflow_branch)
_set_var(_env, "CI_TARGET_REPO", self.github_repository)
diff --git a/dev/breeze/tests/test_pr_info.py b/dev/breeze/tests/test_pr_info.py
index 651009da0b..1c874e5c4d 100644
--- a/dev/breeze/tests/test_pr_info.py
+++ b/dev/breeze/tests/test_pr_info.py
@@ -68,7 +68,7 @@ def test_schedule():
assert wi.event_name == "schedule"
assert wi.pr_number is None
assert wi.get_runs_on() == '["ubuntu-22.04"]'
- assert wi.is_canary_run() == "false"
+ assert wi.is_canary_run() == "true"
assert wi.run_coverage() == "false"
