Skip to content

Bug Fix for apache-airflow-providers-jenkins JenkinsJobTriggerOperator #22802

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 6 commits into from
Apr 12, 2022
Merged

Bug Fix for apache-airflow-providers-jenkins JenkinsJobTriggerOperator #22802

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ba4670
bugfix for when polling for the created job, if fail to get job info …
SasanAhmadi Apr 6, 2022
c0458a9
Merge branch 'main' into bugfix-for-jenkins-job-trigger-operator
SasanAhmadi Apr 6, 2022
99721eb
Merge branch 'apache:main' into bugfix-for-jenkins-job-trigger-operator
SasanAhmadi Apr 7, 2022
e4a61e8
correct static code problem
SasanAhmadi Apr 7, 2022
f8235b1
reduce the size of enclosing code in try except
SasanAhmadi Apr 7, 2022
c1b92ec
corrected for code review
SasanAhmadi Apr 7, 2022
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
18 changes: 14 additions & 4 deletions 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 @@ -153,9 +153,18 @@ def poll_job_in_queue(self, location: str, jenkins_server: Jenkins) -> int:
# once it will be available in python-jenkins (v > 0.4.15)
self.log.info('Polling jenkins queue at the url %s', location)
while try_count < self.max_try_before_job_appears:
location_answer = jenkins_request_with_headers(
jenkins_server, Request(method='POST', url=location)
)
try:
location_answer = jenkins_request_with_headers(
jenkins_server, Request(method='POST', url=location)
)
# we don't want to fail the operator, this will continue to poll
# until max_try_before_job_appears reached
except (HTTPError, JenkinsException):
self.log.warning('polling failed, retrying', exc_info=True)
try_count += 1
time.sleep(self.sleep_time)
continue

if location_answer is not None:
json_response = json.loads(location_answer['body'])
if (
Expand All @@ -168,8 +177,9 @@ def poll_job_in_queue(self, location: str, jenkins_server: Jenkins) -> int:
return build_number
try_count += 1
time.sleep(self.sleep_time)

raise AirflowException(
"The job hasn't been executed after polling " f"the queue {self.max_try_before_job_appears} times"
f"The job hasn't been executed after polling the queue {self.max_try_before_job_appears} times"
)

def get_hook(self) -> JenkinsHook:
Expand Down