mirror of
git://git.yoctoproject.org/yocto-autobuilder2.git
synced 2025-07-19 20:59:02 +02:00
builders: Don't reset yp_build_revision if it is already set
This avoids OE-Core builds reseting to an OE-Core revision, cleaning up the console display. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
921ce8f47c
commit
2eb0365c64
|
@ -115,11 +115,13 @@ def create_builder_factory():
|
|||
|
||||
f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse HEAD"),
|
||||
property="yp_build_revision",
|
||||
doStepIf=util.Property("yp_build_revision", default='') == '',
|
||||
haltOnFailure=True,
|
||||
name='Set build revision'))
|
||||
|
||||
f.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse --abbrev-ref HEAD"),
|
||||
property="yp_build_branch",
|
||||
doStepIf=util.Property("yp_build_branch", default='') == '',
|
||||
haltOnFailure=True,
|
||||
name='Set build branch'))
|
||||
|
||||
|
@ -277,11 +279,13 @@ def create_parent_builder_factory(buildername, waitname):
|
|||
|
||||
factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse HEAD"),
|
||||
property="yp_build_revision",
|
||||
doStepIf=util.Property("yp_build_revision", default='') == '',
|
||||
haltOnFailure=True,
|
||||
name='Set build revision'))
|
||||
|
||||
factory.addStep(steps.SetPropertyFromCommand(command=util.Interpolate("cd %(prop:builddir)s/build; git rev-parse --abbrev-ref HEAD"),
|
||||
property="yp_build_branch",
|
||||
doStepIf=util.Property("yp_build_branch", default='') == '',
|
||||
haltOnFailure=True,
|
||||
name='Set build branch'))
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user