@@ -479,13 +479,23 @@ def get_nightly(build_log_url,build_log_response, job_platform):
479
479
nightly_initial_log_re = re .compile ('(Resolved release {}-initial to (\S+))' .format (job_platform ), re .MULTILINE | re .DOTALL )
480
480
nightly_initial_log_match = nightly_initial_log_re .search (build_log_response .text )
481
481
if nightly_initial_log_match is None :
482
- nightly = "Unable to fetch nightly {}-initial information- No match found" .format (job_platform )
482
+ nightly_initial_log_re = re .compile ('(Using explicitly provided pull-spec for release {}-initial \((\S+)\))' .format (job_platform ), re .MULTILINE | re .DOTALL )
483
+ nightly_initial_log_match = nightly_initial_log_re .search (build_log_response .text )
484
+ if nightly_initial_log_match is None :
485
+ nightly = " Unable to fetch nightly {}-initial information- No match found" .format (job_platform )
486
+ else :
487
+ nightly = job_platform + "-initial-" + nightly_initial_log_match .group (2 )
483
488
else :
484
489
nightly = job_platform + "-initial-" + nightly_initial_log_match .group (2 )
485
490
nightly_latest_log_re = re .compile ('(Resolved release {}-latest to (\S+))' .format (job_platform ), re .MULTILINE | re .DOTALL )
486
491
nightly_latest_log_match = nightly_latest_log_re .search (build_log_response .text )
487
492
if nightly_latest_log_match is None :
488
- nightly = nightly + " Unable to fetch nightly {}-latest information- No match found" .format (job_platform )
493
+ nightly_latest_log_re = re .compile ('(Using explicitly provided pull-spec for release {}-latest \((\S+)\))' .format (job_platform ), re .MULTILINE | re .DOTALL )
494
+ nightly_latest_log_match = nightly_latest_log_re .search (build_log_response .text )
495
+ if nightly_latest_log_match is None :
496
+ nightly = nightly + " Unable to fetch nightly {}-latest information- No match found" .format (job_platform )
497
+ else :
498
+ nightly = nightly + " " + job_platform + "-latest-" + nightly_latest_log_match .group (2 )
489
499
else :
490
500
nightly = nightly + " " + job_platform + "-latest-" + nightly_latest_log_match .group (2 )
491
501
return nightly
0 commit comments