@@ -378,7 +378,7 @@ def extra_run_arg(self, benchmark, args, image_run_args):
378
378
379
379
def build_assertions (self , benchmark : str , is_gate : bool ) -> List [str ]:
380
380
# We cannot enable assertions along with emitting a build report for layered images, due to GR-65751
381
- if self .stages_info .current_stage .is_layered :
381
+ if self .stages_info .current_stage .is_layered () :
382
382
return []
383
383
return super ().build_assertions (benchmark , is_gate )
384
384
@@ -629,12 +629,13 @@ def _load_gos_scenario_home(self) -> Path:
629
629
630
630
def _read_gos_scenario_version (self ):
631
631
"""
632
- Dynamically gets the version of the graalos-load-tester based on git tags ,
633
- or reverts to default 'unknown' otherwise .
632
+ Dynamically gets the version of the graalos-load-tester based on the pyproject.toml file ,
633
+ falls back to 'unknown' if unsuccessful .
634
634
"""
635
- # Revisit this method once we rework versioning for graalos-load-tester (GR-59986)
636
635
try :
637
- return mx .GitConfig ().git_command (self .gos_scenario_home , ["describe" , "--tags" , "--abbrev=0" ]).strip ()
636
+ out = mx .OutputCapture ()
637
+ mx .run ([self ._gos_scenario_command (), "--version" ], out = out , env = self .get_stage_env ())
638
+ return out .data .strip ()
638
639
except :
639
640
return self .defaultSuiteVersion ()
640
641
@@ -850,7 +851,10 @@ def extra_run_arg(self, benchmark, args, image_run_args):
850
851
851
852
def build_assertions (self , benchmark : str , is_gate : bool ) -> List [str ]:
852
853
# We cannot enable assertions along with emitting a build report for layered images, due to GR-65751
853
- if self .stages_info .current_stage .is_layered :
854
+ if self .stages_info .current_stage .is_layered ():
855
+ return []
856
+ # We cannot enable assertions for Micronaut Pegasus Function due to an AssertionError (see GR-67326)
857
+ if self ._get_benchmark_config (benchmark )["app" ] == "micronaut-pegasus-function" :
854
858
return []
855
859
return super ().build_assertions (benchmark , is_gate )
856
860
0 commit comments