Skip to content

Commit

Permalink
Fix eco triggering for bintar
Browse files Browse the repository at this point in the history
This is a fix for MariaDB@3d3722a

Previously this step had a hasEco(step) condition
which prevented the bintar builders from triggering any eco builders.

Even with this bug, the eco builders are not triggered because
the name of the parent builder doesn't match anything in the ECO_BUILDERS pattern. See: https://buildbot.dev.mariadb.org/#/builders/172/builds/303
See also ecoBuilders function which renders the ECO builder names at runtime based on parentbuildername.

This bug, in fact, revealed another behaviour.
Currently, the presence of this trigger in the Bintar factory is unnecessary, as there is no use case
according to the ECO_BUILDERS list. Therefore, my proposal is to eliminate this step from the factory.
  • Loading branch information
RazvanLiviuVarzaru committed Jan 20, 2025
1 parent b90887f commit 0f5ca9f
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions master-docker-nonstandard/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1473,22 +1473,6 @@ f_bintar.addStep(
doStepIf=(lambda step: savePackageIfBranchMatch(step, SAVED_PACKAGE_BRANCHES)),
)
)
f_bintar.addStep(
steps.Trigger(
name="eco",
schedulerNames=["s_eco"],
waitForFinish=False,
updateSourceStamp=False,
set_properties={
"parentbuildername": Property("buildername"),
"tarbuildnum": Property("tarbuildnum"),
"mariadb_binary": Property("mariadb_binary"),
"mariadb_version": Property("mariadb_version"),
"master_branch": Property("master_branch"),
},
doStepIf=(lambda step: savePackageIfBranchMatch(step, SAVED_PACKAGE_BRANCHES)),
)
)
f_bintar.addStep(
steps.ShellCommand(
name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True
Expand Down

0 comments on commit 0f5ca9f

Please sign in to comment.