Skip to content

Update Jenkins for Airflow 3.0 compatibility #52510

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
kaxil merged 3 commits into from
Jun 30, 2025
Merged

Update Jenkins for Airflow 3.0 compatibility #52510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af6201d
migrate jenkins provider to sdk BaseOperator
gopidesupavan Jun 30, 2025
3638240
migrate jenkins provider to sdk BaseOperator
gopidesupavan Jun 30, 2025
1cbcc54
remove v3_1
gopidesupavan Jun 30, 2025
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
2 changes: 1 addition & 1 deletion providers/jenkins/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
from requests import Request

from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.jenkins.hooks.jenkins import JenkinsHook
from airflow.providers.jenkins.version_compat import BaseOperator

JenkinsRequest = Mapping[str, Any]
ParamType = str | dict | list | None
Expand Down
13 changes: 2 additions & 11 deletions providers/jenkins/src/airflow/providers/jenkins/sensors/jenkins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,10 @@

from airflow.exceptions import AirflowException
from airflow.providers.jenkins.hooks.jenkins import JenkinsHook
from airflow.providers.jenkins.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseSensorOperator
else:
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]
from airflow.providers.jenkins.version_compat import BaseSensorOperator

if TYPE_CHECKING:
try:
from airflow.sdk.definitions.context import Context
except ImportError:
# TODO: Remove once provider drops support for Airflow 2
from airflow.utils.context import Context
from airflow.providers.jenkins.version_compat import Context


class JenkinsBuildSensor(BaseSensorOperator):
Expand Down
15 changes: 15 additions & 0 deletions providers/jenkins/src/airflow/providers/jenkins/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,18 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:


AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator, BaseSensorOperator
from airflow.sdk.definitions.context import Context
else:
from airflow.models import BaseOperator # type: ignore[no-redef]
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]
from airflow.utils.context import Context # type: ignore[no-redef]

__all__ = [
"AIRFLOW_V_3_0_PLUS",
"BaseOperator",
"BaseSensorOperator",
"Context",
]