Skip to content

Commit

Permalink
Fix for MDBF-746 - quickBuild builders always ran Galera
Browse files Browse the repository at this point in the history
- by MDBF-736 a bug was introduced so the condition hasGalera and compile_step_completed was always evaluated to True because it will check that hasGalera it's a valid reference (TRUE) instead of calling it
- now doStepIf receives a lambda function that is evaluated at runtime so hasGalera can return True/False based on the builder name if it's in the builders_galera_mtr list
  • Loading branch information
RazvanLiviuVarzaru committed Jul 18, 2024
1 parent 3f4bc68 commit eb3dc6c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions common_factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ def addGaleraTests(factory, mtrDbPool):
dbpool=mtrDbPool,
autoCreateTables=True,
env=mtrEnv,
doStepIf=hasGalera
and util.Property("compile_step_completed", default=False),
doStepIf=lambda props: hasGalera(props)
and props.hasProperty("compile_step_completed"),
)
)
factory.addStep(
Expand All @@ -353,8 +353,8 @@ def addGaleraTests(factory, mtrDbPool):
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
),
],
doStepIf=hasGalera
and util.Property("compile_step_completed", default=False),
doStepIf=lambda props: hasGalera(props)
and props.hasProperty("compile_step_completed"),
)
)
return factory
Expand Down

0 comments on commit eb3dc6c

Please sign in to comment.