Skip to content

Commit c2096ad

Browse files
updated get_nodes status
Signed-off-by: Alokgoswami-ag <[email protected]> Co-authored-by: Shilpa Gokul <[email protected]>
1 parent 36310e5 commit c2096ad

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

monitor.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,16 +371,28 @@ def get_node_status(spy_link):
371371

372372
node_log_url = PROW_VIEW_URL + spy_link[8:] + \
373373
"/artifacts/" + job_type +"/artifacts/oc_cmds/nodes"
374+
375+
pattern=r"(\d+\.\d+)"
376+
match=re.search(pattern,spy_link[8:])
377+
version=float(match.group(1))
378+
if "upgrade" in spy_link:
379+
version=version-0.01
380+
374381

375382
try:
376383
node_log_response = requests.get(node_log_url, verify=False, timeout=15)
377384
if "NAME" in node_log_response.text:
385+
if version > 4.15 and job_platform == "libvirt":
386+
workers="compute-"
387+
else:
388+
workers="worker-"
389+
378390
response_str=node_log_response.text
379391
if "NotReady" in response_str:
380392
return "Some Nodes are in NotReady state"
381393
elif response_str.count("control-plane,master") != 3:
382394
return "Not all master nodes are up and running"
383-
elif ((job_platform == "mce" or "compact" in node_log_url ) and response_str.count("worker") != 3) or ((job_platform != "mce" and "compact" not in node_log_url) and response_str.count("worker-") != 2):
395+
elif ((job_platform == "mce" or "compact" in node_log_url ) and response_str.count("worker") != 3) or ((job_platform != "mce" and "compact" not in node_log_url) and response_str.count(workers) != 2):
384396
return "Not all worker nodes are up and running"
385397
else:
386398
return "Node details not found"
@@ -1098,7 +1110,7 @@ def get_next_page_first_build_date(ci_next_page_spylink,end_date):
10981110
def get_brief_job_info(build_list,prow_ci_name,zone=None):
10991111

11001112
"""
1101-
Gets brief information of all the jobs.
1113+
Gets brief information of all the jobs
11021114
11031115
Args:
11041116
build_list: list of builds

0 commit comments

Comments
 (0)