diff --git a/joj3_config_generator/generator.py b/joj3_config_generator/generator.py index f0afc62..2b6f471 100644 --- a/joj3_config_generator/generator.py +++ b/joj3_config_generator/generator.py @@ -7,7 +7,7 @@ from joj3_config_generator.transformers.answer import get_task_conf_from_answers from joj3_config_generator.transformers.joj1 import get_task_conf_from_joj1 from joj3_config_generator.transformers.repo import ( get_health_check_stage, - get_teapot_stage, + get_teapot_post_stage, ) from joj3_config_generator.transformers.task import get_conf_stage @@ -42,6 +42,6 @@ def convert_joj3_conf(repo_conf: repo.Config, task_conf: task.Config) -> result. for task_stage in task_conf.stages: result_conf.stage.stages.append(get_conf_stage(task_conf, task_stage, cached)) if not repo_conf.force_skip_teapot_on_test or not current_test: - result_conf.stage.post_stages.append(get_teapot_stage(repo_conf)) + result_conf.stage.post_stages.append(get_teapot_post_stage(repo_conf)) return result_conf diff --git a/joj3_config_generator/transformers/repo.py b/joj3_config_generator/transformers/repo.py index feb959d..05eaf76 100644 --- a/joj3_config_generator/transformers/repo.py +++ b/joj3_config_generator/transformers/repo.py @@ -6,7 +6,7 @@ from joj3_config_generator.models import common, repo, result from joj3_config_generator.models.const import TEAPOT_CONFIG_ROOT, TEAPOT_LOG_PATH -def get_teapot_stage(repo_conf: repo.Config) -> result.StageDetail: +def get_teapot_post_stage(repo_conf: repo.Config) -> result.StageDetail: args = [ "/usr/local/bin/joint-teapot", "joj3-all-env", @@ -33,7 +33,10 @@ def get_teapot_stage(repo_conf: repo.Config) -> result.StageDetail: cases=[], ), ), - parsers=[result.Parser(name="log", with_=result.MsgConfig(msg="joj3 summary"))], + parsers=[ + result.Parser(name="log", with_=result.MsgConfig(msg="joj3 summary")), + result.Parser(name="debug"), + ], ) return stage_conf @@ -96,7 +99,7 @@ def get_health_check_stage(repo_conf: repo.Config) -> result.StageDetail: name="healthcheck", with_=result.ScoreConfig(score=repo_conf.health_check_score), ), - result.Parser(name="debug", with_=result.ScoreConfig(score=0)), + result.Parser(name="debug"), ], ) return health_check_stage